Photoshop :: Unsatisfactory Known Font Corruption Resolution?

I've had this very strange phenomenon occurring in a PSD I've been working on for a long while. I go to edit text and it randomly appears as text from another layer in the document. I tried a bunch of font workarounds, tested the fonts elsewhere, made sure everything was copacetic that way, and then finally found this article:[URL}...
 
In the article it tells me I have to recreate my PSD, using only "raster layers", and discarding ALL text and Vector shape layers. Probably 90% of my PSDs are built using type and vector layers these days. There's some raster elements, they pale by comparison to the vector stuff though.
 
So, I'm writing to find out if there's any better a resolution in the works? Adobe? My PSD is for a web site with 8 sections.Each section has between 10-30 layers, most of which are text and vector content. Plus the navigation, all of which is text, and there are three states for each built in layers, so 24 layers of navigation states alone. I mean, the document has hundreds of hours into it at this point probably and you're telling me the solution is to recreate it is, well, stunning.