Re-listen to the Architect's speech at the end of M2. You can almost see what I just said.
If you ask me it would have been a much cooler turn out. Unfortunately, as much as I'm going to bend these movies to my will, there's just no way to make that story happen.

I'll just have to become a rich and powerful Hollywood producer/director and re-make the last film.
Edit: Ok, I think you talked me into it. I'm going to rework the script MeBeJedi. I had been living with the idea of Neo having TRW powers so long I forgot how much the idea blew when I first saw it. The Squid-zap is an easy cut. I was actually going to construct a new prophetic dream for M3 in which Neo forsees the upcoming battles, Trinity's death and his own blindness (if he can see the future, how did that take him by surprise?) At least that's an afternoon I'll have back.
Large cuts for removing BlindOVision should be easy enough, but the real problem is the real world Smith fight. If he's blind, how will he defeat him? I suppose he still know Kung Fu outside the Matrix. I guess it's easier to believe he's Zatoichi than Muadib.