Series 3 engine and gearbox mounts.

Evening all, I have just crawled out from beneath my engine, it's a 2.286 petrol, 3 bearing, as identified on here yesterday, I have noticed the mounts are shot, they look to be the correct type (circular), the gearbox ones are shot as well (explains the vibration)but are square, I think this is because the series 3 109 was originally a Deisel version, I am going to change the lot and was wondering whether to change them all for the round ones or put new square ones on the gearbox and round ones on the engine. Any input would be much appreciated, the Haynes manual says nothing about it.

I replaced all the mounts with round ones on my 88
But I used old ford engine mounts which were made from softer rubber than Land Rover mounts
Made a massive difference,no more vibrating bulkhead