Yeah, everything looks good except your batt temps. I would think that it would be hard to say whether you will get more speed, less speed, or the same speed going to the 4S setup, since we don't know what quality your nimh cells are. In any case, a good lipo will hold its voltage better than a nimh pack, so although overall speed may not increase, you should really see an increase in zip.