IMO you need to decide on the engine before everything else. The plan you just described would leave you wasting money on a 3.0 + TD04 setup when you seem to want to use the 3.5 later on.