It sounds like a restore would be the best option. Just make sure you are all backed up and then restore it.
The reason I say this is because sometimes problems are like ants in a kitchen. You may only see one or two, but there are probably many more hidden. And the iPhone is so easy and quick to restore.