I'd suggest a kwa sr-12, a new hop up rubber (unless kwa's are good because I dont personally know about their rubbers), and a new bucking. I've heard H nub buckings are good. Then with the full stock on the sr-12 you have almost any choice of battery. I'd go with a 11.1 lipo. I have had good success with firefox brand lipo's but its really personal preference.