Yes, you should be OK, as long as you get another sensored motor. (I'm assuming it's a sensored motor, seeing as it is Novak, right?)
I'd probably go with a 10.5. Much more manageable in a 2wd.
Also, if you've already got it geared on the low side, and you have a decent radio with EPA (end point adjustment), you should be able to dial out some of the speed of your 6.5 to make it less of a handful.
