Regarding batteries, a major design choice is between primary (non-rechargeable) and secondary (rechargeable).
Though primary batteries aren't rechargeable, they have the highest energy densities of all batteries and they tend to have longer shelf lives. One of the lithium metal chemistries would be the way to go today. They have better energy density than the Apollo workhorse, silver-zinc.
Silver-zinc's energy density is roughly comparable to lithium-ion, but while the latter has hundreds of charge cycles most Ag/Zn batteries, if they're rechargeable at all, have cycle lives in the single digits (e.g., those in the Apollo CM).
The workhorse rechargeable battery for aerospace in the past few decades has been nickel-hydrogen. They're similar to nickel metal hydride except that the hydrogen is stored as a gas instead of as a metal hydride, making them lighter but bulkier. I think they're now being displaced by li-ion, but li-ion has yet to prove itself in the lifetime category.
There are no obvious winners here just as there aren't any in terrestrial applications. Each has its plusses and minuses.
Fuel cells are another good option, assuming the water can be recycled and electrolyzed back into hydrogen and oxygen. The cycle energy efficiency isn't great, but the service lifetime could be very good.