Have you considered changing TC-14 into C-3PO (color change and Anthony Daniels lines- from "The Clone Wars" cartoon maybe?). That would give TPM more OT character, after all that's what you're trying to achieve in your edits.

One more thing: are you going to change Obi's lightsaber in AotC (in your edits- AotR) to green one that he took from Qui-Gon? His lightsaber in original Episode II is exactly the same as in previous episode (how did he managed to get it back for that bottomless pit?).