I've gone with one of these plus many , many options (including the swappable battery). Let the waiting begin!

Web order, will be delivered to my work address. Life is good.