Well, i would lower timing to 10 degrees and put a bigger prop on. 4400kv with a max voltage of 7.4 gives you no room but should use a smaller boat and a big prop. You did mention that all was cool after running with no speed increase.