Well, stepping up in either ESC or motor is a considerable jump. The next step for the ESC would be about 275, the motor around the same. It would be a better, more efficient (cooler) setup, but not sure if you'd want to hit the 1,000 price point... unless you become an addict like us.

Besides, you're gonna want to save a few pennies to replace the oddball thing that will break...
I think the 8XL or 9XL, 4s lipo, and MM ESC is the way to go in your case.