I'd recommend the dell XPS 13 developer edition (it comes with ubuntu). I'm not sure about the battery, but the form factor is pretty close to the MBA.