When I look at the XL in brush aluminum I see you are waiting until June 2018 shipment - which means if you are not in the first 20-30 orders for that shipment you might, (probably), be waiting until July.
Did you see that the bike you want with but with the standard battery is available to...