A bit lower powered but will likely get far more for your money, how about a Mondingo TDCi mate?? I know they've got their common faults... but you're not shy with a spanner and have useful contacts if problems do arise. Or are you really wanting to up the cylinder count this time round??
Cheers,
Grant