Stay with the 22T bottom end, and maybe add some ACL race bearings throughout. Put 20g heads on it. Follow all that up with upgraded fun stuff like a bit of porting, injectors, fuel pump, etc. You know what I'm talking about. Also, make sure you get a nice aluminum radiator to keep it cool.