Don't bodge it any more!!! If you're going to hassle of trying to run
green/yellow covered wire everywhere, then get new T&E cable and do the
whole lot a new.

Yes, you would have to take each separate part of the earth bonding back to
the consumer unit, eventually.