Was going to suggest adjusting the TPS, but you did it already. Did you use the guide here?
I'd also check the timing is right, i.e. make sure it is set in the diagnostic mode with the pins bridged. It's almost like you are labouring the engine too much and just need to shift down a gear?