You may want to consider getting a nice high efficiency adjustable switching regulator. I don't know if the HDMIPI will run off a flat 5.0v which would be safer for the pi.
But you can get a cheap one on amazon or ebay or something. 3A would be more than enough, and are the norm. Just adjust it to 5.0v and you're set.
WiFi adapters take a lot of power, so my suggestion is to make a short extension with the positive lead to a hardware 2 pole switch. If you don't need wifi, just flip the switch and you're set.
Here's some stuff ill be doing/using to save power.
I plan on using an octopus usb hub, like the one pictured below. Easily pop open the case, and desolder the wires. I have a 7 port one, that uses 2 internal 4 port hub controllers. I opened it, cut the power trace that goes from main usb port, that leads to the 5/7 other ports, and then made 5 of the ports external power only. I then connected the remaining 2 ports to the host's pos voltage line (since i had cut the trace), so 2 ports can be powered by the pi.

I then used red nail polish on the plug ends to mark which ones are powered internally.
It works amazingly well. This way when i build my own pi laptop, i can disassemble the usb hub, remove the cables, and make it into a smaller package, i can connect the 5 externally powered ports to an external switching regulator (with a switch). keeping the other 2 connected normally through the pi. So a wireless keyboard receiver will be powered by the pi. And i can flip a switch to cut power to the rest of the ports. or individual ports.
I love switches though, i was going to have a 5 switch dip-switch (for usb ports) and multiple larger switches to turn off everything from the pi, the usb ports, the wifi, the hdmi screen, my little 2x16 lcd screen(for my micro-controller), a switch for the micro-controller board itself, my "xbee", switches for everything.
PS that 6000mAh battery looks amazing! no regulator needed!
I think i'll use that too, just add a usb power port inside the laptop and a little tray that can be accessed externally, just use them as slide in, slide out battery packs.
My RPi needs a fan, heat will leech into the battery, so people saying I don't need a fan, don't understand how Li-Po batteries are affected by high temps. Cool pi = cool battery.
I would very much so like to see a Pi2/Pi3 Zero, power and size.