Shockwave motor/esc query.

Possible upgrades looking at by end of season,possibly fitting a brand new Turnigy Marine 120A esc, in place of the rather small 30ADynamite, then a motor upgrade to maybe the 6 pole Dynamite 2000 kv used in Velos, which i realise uses larger plugs than the 4 pole motors ones in the Shockwave,but another alternative i liked the look of was the Turnigy Marine 2200 kv ,basically im looking at a noticeable power increase without having to perform "expert surgery" , in other words a near plug and play operation upgrade. Is this a feasible enough upgrade to consider? or ar there other things to factor in to the equation? Like maybe prop changes? Any suggestions would be appreciated.