Classic Turbo D and former L322 owner

Hi all, new to the site, but not new the world of Range Rover! Got a Classic Turbo D, that is looking sorry for its self, but I will remedy that in the next 2 years.. Just as the free road tax kicks in!! Not too sure if I'm going to stay with the woeful VM diesel lump or continue to get it MOT'd and do a BMW M57 conversion....
That rather depends on the reason for being here, I would love another L322 TD6... but with another make of gearbox...