Yes, definitely need to decide whether you want to stay 4s or jump to 5s or 6s?
A new pack that you should consider is the Hyperion G3 VX. I have heard nothing but good from the packs from boaters and they are the hardest on batteries. So I picked up a pair of 2s packs to try out.
www.allerc.com has them.