I'd prefer the larger hi-cap battery, that way if we overclock, we'll have a better battery life, OR if we put in addons (like bluetooth, or something else) we'd have an average battery.
Squidge's idea is nice, but I don't want a machine with a cheap battery, I then have to buy another battery...