Need advice on a motor swap

[3b3b]

I have a Proboat Shockwave BL V3. Stock has a 45 amp esc, 3630 1500KV, running on 3s and using the stock prop which I think is 40mm. I would like to keep everything stock and just swap out the motor with a higher KV. Looking for suggestions and wondering if this motor would work. I realize it's a 4 pole rather than a 6. And thinking that I might have to prop down to a 38mm or less since I'm increasing the KV's. Max current says 28 amps I think. Biggest lipo I have is a 4400mah but could use a 3700 or 3200mah if that helps in any way.
http://www.valuehobby.com/power-syst...ed-2200kv.html

If not this one... any recommendations for another motor that I can drop in?

edit. Link to motor no longer works. All sold out.

So... any suggestions on a motor swap using the stock esc? Or is the esc too low and get a new esc and motor combo?