...the obvious fix would be to eliminate the batteries. Just require ground power to fuel/maintain/start the aircraft.
Standing behind my usual claim of ignorance, I'd guess that NiCd would be fine in the APU-battery role, and it's lithium just to keep the LRU count down. The real requirements for the two batteries must be hugely different.
Any bets on who'll win the showdown between DOT and Boeing?