Mk2 Clio engine mounts

I'm trying to improve the engine stability in a friends Clio (1.6 16V RSI 2001). The car had a new "Dog Bone" around 8 months ago which improved the situation no end but the problem has gradually returned. I suspect the dog bone has worn again along with the other mounts.

I'm thinking about replacing the upper gearbox mount and RH top engine mount with 172/182 items and replacing the "Dog Bone" mounts with Poly parts (PowerFlex).

I've also notice that the 172/182 has an additional gearbox mount/steady (shown in this Ebay advert http://cgi.ebay.co.uk/Renault-clio-172-cup-gearbox... does anyone know if this fits the 16V RSI?

The car is really being let down by the amount of engine movement.

Opinions/advice wanted