[Ivan D.]

If I were you I'd leave the engine as is and have it dynoed at whatever it makes now - seems to me you'll only pay more in insurance and registration fees if you're making lots of power, and if the engine runs well now they will not have any reasons to suspect you're sandbagging. Then when you're set with the paperwork take it to your friend's shop and diel it in even better, you probably won't see that much of an increase in performance from there so you shouldn't be harassed if you ever get pulled over.