Burnt up my TFL/HK Bolt's 2040, what new motor?

[Dashunde]

Just got back from running my little Bolt, and I'm perplexed..

Using 3s 2200 and a Octura x430 I managed to smoke the stock 2040.
It ran fine the first few minutes, not silly-fast or anything else odd, then it slowed down a bit so I pulled it out and checked it over, drive-line and water flow seemed fine.
I raised the strut as far as possible (torquing to the right pretty hard) and ran it again... no dice, barely got it back to shore, I took the hatch off and it threw one last insult my way in the form of a stunk up truck.

The Turnigy 30a esc didnt break a sweat.

The cable drive has a bit too much drag for a boat this size (.098"), but aside from that.. where did I go wrong?
Is the x430 too much prop for a 2040 2600kv on 3s? I wouldn't think so, its basically the metal identical to the 30mm plastic that came with it.

I'd kinda like to move it up to a 28x35 ~3000kv... but not sure which one to buy, and the stock brass and motor mount dont leave much room for larger couplers.
(My Tenshock Mini Eco has a nice ~2830'ish (Tenshock Viper VZ1515) that would be perfect for this Bolt, but I cant find a 16 turn/3500kv for sale anywhere)

Your thoughts?