Hey Steve:
OK, first the grain-o-salt: I fly slime CL. None of the CL-specific stuff I say comes from direct personal experience. But I'm an electrical engineer and I fly electric RC, so I think I know some of this stuff.
Second, if you're putting back 2400mAh into a 3300mAh pack, then you're currently doing fine as far as energy use goes. We may be able to change that, however.
Third, I think you need to increase the launch RPM a bit. You should have enough voltage overhead to push the launch RPM up to nearly 10,000 RPM, which is probably way too fast. I vote for nudging the speed up a bit and seeing if it fixes the verticals and overheads without speeding up your level flight and rounds too much. If you're feeling it run out of grunt as loss of line tension, then make sure that you've done a Really Good Job trimming it after the make over, perhaps after you bump up the RPM, at least temporarily.
After you get the RPM up, if it flies nice, pay attention to how much is going back into the pack, just to make sure that you're not overtaxing your batteries.