Well, about the lipo's those new ballanced FMA's ? Or the Kokam 3200's..
A 1950 would get my vote. I like a large motor on not too many cells.. (you also experienced it with your XL) you could also get a wanderer 8XL or a 9XL.. if they only had those segmented magnets...