Can someone maybe recommend a different ESC/Motor combo that will be capable of higher RPM and still have torque or even handle higher voltage.. I've got nothing aginst going to 12s lipo if I can, actually it would be very nice...

Like I said, I'm aiming for the same or close to power to weight ratio that my 1/18 XRAY M18 and my RC18T have with a 2480MAH 3S lipo and Mamba CompX motors at 8000kv.