PG1 floppy gearlever fix bodge

My gearlever was so floppy it was like it was not connected to anything. Second was scraping passenger seat. 5th somewhere underneath my dash... So yesterday I removed the linkage. The rear connection underneath gearlever was easy but the bitch pin (roll pin) at gearbox end took a bit longer. I then carefully grinded the 2 pins of from the universal with dremel to remove them. They get replaced by M8 x 60mm stainless bolts. The bitch pin I'm also replacing with a M8 stainless bolt and Nyloc. On the universal the rear inserts was fine it just needed the new bolt since the pin had wear on it. The front part was the main culprit. Two mangled pieces of rubber fell out. I kept the plastic end caps and steel inserts. Then took 15mm PEX water pipe and drilled out the inside with a 12mm drill. The outside is 15mm. Inside this I fit the steel inserts, then plastic end on one side and slide back in universal. Other end cap, fit universal back together, bolts in and tighten. It is a tight fit. The gear lever now feels much better. I know you can buy aftermarket rubber kits for this but in my instance by the time I've paid shipping and duty to South Africa it is bloody expensive. So will see how long the water pipe bushing last!! Next time will be much quicker anyhow since no pins to remove.