i wanna say you should be faster.....do you know which stock cyl your bike has?
also, the za is a great engine. opinions vary, but i dont see any reason to change the engine if the pucks were done....
if i were you id just get a selection of jets and an airsal...cheap, fun, and your 80% there already....but dont listen to me