I totally agree with eelnoraa and muzikbiz22.
The DGX800 is too long to mount in a soft Goodman handle and carry on the back of your hand comfortably. Or, I think so, anyway.
I have 2 of the DGX600. I got some Sanyo 18650 batteries from a Canadian supplier off eBay a while back. They are rated at 3400mAh. I have tested them (with an Opus BT-C3400 charger/tester) and they all test at 3300 -3400. With them, the DGX600 lasts PLENTY long to complete a night dive. I believe it lasts somewhere around 90 minutes.
Thus, for what you are talking about, I would get 2 of the DGX600 and 2 of the 3400mAh batteries. The stock batteries that come with the DGX600 tested out right at what they are rated for (2600?).
So, for 2 night dives, start with your primary light with a 3400 in it and the backup light with a 2600 in it. If you do a second night dive, change the primary light to your second, fresh 3400. You shouldn't be using the backup, so you wouldn't need to change the battery. But, if your primary light fails during the first dive, you use the backup. Then, for the second dive, if you're able to get your primary going again, use the fresh 3400 in it and use the fresh 2600 in your backup.
Get an Opus charger and you can charge all 4 batteries at once and also keep tabs on their current capacity, so you can pretty well avoid getting in the water and having a battery die prematurely.
Also, just my experience, I had a DGX600 and a DGX MAX. The MAX died after about 2 months for no apparent reason. There was no visible water inside. DGX replaced it without question. But, at my request, I got a second 600 instead of another MAX. The MAX promised to be able to be turned on and off with one hand. In practice, the On/Off ring was stiff enough to turn that I could not do it with one hand. And I am a 6' 1", 220 pound guy that is of average strength for my size. Also, once or twice I tried to turn on the MAX and ended up twisting the head instead of the On/Off ring. All in all, I think the 600 is a better design. There are other lights that are nicer - that give truly one-handed one/off and also variable brightness and an LED indicator for battery charge level. But, AFAIK, they are over $100, so I would still just stick with the DGX 600 and put a fresh battery in before each dive.