RE: MT2 HPI
Since you have the G3.0 motor, I wouldn't upgrade the motor, get the 13T bell, with a exhaust for bottom end, and you will have enough torque to keep you happy.
By going with a the Os engine above you will be disappointed with the results, it will not be much better than what you will have.