I would use Devil Developments if you end up going to a full zetec route, the guy certainly knows his shit, and has built some big bhp reliable zetecs.

He can still do CVH/ZVH though, and is very reasonably priced, so might be worth a phone call mate...
01903 731194