I was planning on doing at the end of last month... but decided like you mention that's its not enough.Oh man hope soon.. I'd wait on that reset IMO not enough to get me to reset my phone
By the end of this month, I don't have it... then yeah.. factory reset is my best solution. I've done it before in the past... it works.