swap from 4wd to 2wd?

[Rocking Donkey]

I think that before changing car it might be worth going for a milder motor. I don't know what you are running, but slower is always easier and more consistent, and makes setup let critical. An 8.5T motor is plenty for 2WD but should feel quite mild in 4WD. I would say before changing the car change the motor as you will need a new motor for 2WD anyway.