That's really good to have another build on the go and you will definitely that things will go a lot smoother with less headaches - not sure about the good lady winging at 9pm though....
Tis a good idea about the engine package, where do you propose to obtain this - if you don't mind me asking.
Cheers....AndyH