First of all, welcome to the board!
Secondly, you are doing it right, keep on posting.
As to the points you make: since you agree with me, you are oviously an individual of great learning and sound judgement.
I have heard too many stories like yours, all with expensive headaches, and one with catistrophic consequences. I doubt that design changes can significantly improve what was a bad idea to begin with. More importantly, all of the really experienced divers I know use a mechanical SPG even if they have wireless, and few do.