Just noticed that at current prices, the 10000mAh packs match the 16000mAh on a Wh/£ basis. Not quite as convenient, but more flexible for filling small or awkward shaped spaces.
EDIT: Also, the 4S Multistar packs are even better value than the 6S packs.
You can fit 6 4S 16000mAh packs in an...