So any ideas on how to fix the Anakin/Vader mess?

Regardless of any edits that can be done, or the parallels between Vader and Grevious, we see Anakin turn to the dark side. This can't be changed short of reshooting the film. So this means Obi Wan's description of Vader in ANH "a pupil of mine until he turned to evil" is automatically going to make us think of Anakin.

The only way this can possibly be fixed (I believe I have explored every possible avenue) is to somehow make it so that Obi Wan's description of Luke's father - the great pilot, the cunning warrior, his good friend, could possibly be attributable to someone other than anakin.

Of course, we find out in ESB that Darth Vader and Anakin (Skywalker) are one and the same, but at least it's a surprise if we suspect Luke's father was someone else Obi Wan knew, and not Anakin.

This is the area in which Lucas has completely fucked us over more than any other.