It is not sure that waiting to the next iOS update release will solve the issue/mess in your particular case. Because if there is something messed in your current configuration settings, it will remain also after the update because it will load the old backup data. So, as other user mentioned, the only way is a clean restore and dont use any previous backup with messed settings. I know, it is annoying, but it seems the only way.
Other issues in previous iOS's happened in the past, and even after an update, they were not solved without a clean restore. And even, if you go to an Apple Store, the Apple Genius will be the first thing to tell you before moving a finger.