Improved Battery/Swap selection