I'd go for an iTunes reset to be fair. All the iPhone reset does is "delete" the data on it - doing it through iTunes overwrites the OS with a completely new fresh OS.

Just connect to your computer, open iTunes and click RESTORE and load up the latest firmware. When it says to activate it, don't bother and just unplug it. Sorted.