What you and Chuckie have said. That should do it. With a tune from a dyno. You can change a few things. Also with a dyno sheet. You should be able to tell how tired the motor is. And it gives you a base line for later on.
As for the Z not feeling as "zippy". That could be you being so used to it.