Yeah, original payload with all of the armor. So, you get to keep the armor protection, but you also get the lost payload back. As I understand, the hybrid version is not going to be the production model.
And about the hybrid system being a nightmare, it depends on the particular model. I read up, and saw pictures of a M998 that was converted to diesel/electric that looked very simple. It ditched the whole drivetrain, except for the axles. There were 2 drive motors, one for the front axle, one for the rear, and the engine compartment housed the 1.9 liter(!) VW TDI engine that powered a generator for charging up the batteries stored under the center tunnel, where the transmission/transfer-case/drivelines/fuel tank used to live. It was even reported to be capable of 20 miles of "stealth mode" wherein the engine/generator was shut down and the motors were ran off from batttery power only.
It's really a smart way to power a truck! Most of the time, the huge HP, and therefore the huge engine displacement, is not needed, just for accelerating or hill climbing, so having a giant engine is not needed, when you can have a small, more efficient engine running at it's optimum RPM to charge the batteries, only when commanded by the computer. The batteries store up a lot of power ready for use during acceleration, or hill climbing. In conventional, direct drive drivetrains, the engine is seldom in it's optimum RPM range, thus wasting a good portion of it's fuel. Also, when cruising, you dont need a lot of power to propell the vehicle, but the large engine needed for the high demand times uses more fuel just to keep itself moving.