Yeah, plus the pure amps lipos put out will surely make your motor happy. You'll probably gain a significant amount of watts with a 20c 5 or 6000 mah 2s lipo. 300 deg. ouch, you mixed nicads with nimh? different mah as well??
Oh, I re-read the 7 cell 2400 nicad, my bad, I assumed nobody used nicad or 2400 for that matter anymore.