I don't know about your motor, but just by looking at your pics the best upgrade you can do right now is get rid of the micro switch and pick up a good marine esc. Me personally, I like the RC-Hydros units, but there are many great brands out there.