Great info.
A 2 or 3S 2200 mah battery will work, a 2S may be the way to go. You should consider a smaller battery, maybe something in the 1000 to 1500 mah range. With a smaller battery, 3S becomes viable. With 3S, you can deliver the same watts with fewer amps. This will allow you to quickly get altitude to hunt for thermals.
If you are looking for duration, the 18650 is something to strongly consider. They will give you 3300 mah for less weight than a 2200 lipo. But the older ones have a tough time over 10 amps. Some of the newer ones can approach 20 amps.
In the right conditions, I've had 30 minute flights with my Versa on 2200 3S.