I think the best solution may be to go N/A zetec, chip and cam just to tweak it.. Then find a tubby engine rebuild over time as I want it, uprate the lot and have it nice and shiny for when its ready to go in.