Your options are anything that makes ~7.2-8.4V while being capable of sustaining ~4-4.5A loads safely with the amount of runtime you desire.
Within a 2D mag, that translates to one of the following options:
6xAA NIMH/NICD cells in a 6AA>2D adapter.
7xAA NIMH/NICD cells +1 dummy cell in an 8AA>2D adapter. (rest cells to prevent instaflash, not recommended for high current hobby grade cells, may require a "bored" body to accommodate cells 4 abreast)
2x *large* 3.7V LiCo cells, like AW C or alternative D size cells. (Only for experienced modders who understand the safety issues surrounding LiCo cells.)
2x 3.7V LiMn cells, 18650 or 26650 size (18650s can be purchased from AW as IMR18650s, 26650s can be "harvested" from various tool packs, that will require some research, these are relatively safe cells but have less energy density than LiCo cells).
All options have their tradeoffs, I see you have chosen to start with a 6AA setup, it's great place to start for mag-mods (your order will ship out monday

)
Eric