Yeah nobody seems to have good luck rebuilding the bottom ends on these cars.
Topswap motors are faster than normal gtp motors, you've pretty much got it right on the dp and tune, porting will help. You'll also need to replace alot of little things like coolant elbows, gaskets, sparks.