I think the 8v and 16v will have a lot of the same sensors and such, so wiring should be really easy. You should be able to use most of your original wiring and only add on what you need for the 16v.

I'd get the motor in first then worry about wiring!
Goodluck bud