On my Z, I did basically the same thing as your have mentioned and then went suspension and brakes. I do have a test pipes, because emissions is not the problem where I am at.
I always thought after the tune I had, that the Z had enough power for what I wanted. Been completely happy with it that way for the past 5 years...
