Switch to a Life battery is a good option I didn't see in this thread. Sure the voltage is a touch lower than straight Lipo but that's really not a big deal. No worries about running it too low because it can handle very low voltage that would make the servo's noticably slow and easy to see\feel. 1700mah can be had quite cheaply from Hobbyking or a little more at Amain.