Maybe to solve this, we have armor upgrades above 2.0 take up not cargo space, but nanobot and shield battery holds. Let's say for a Mk. VIII armor upgrade, you get 10 less of each regen type.
As for Caps, knock off 50 batts/bots for 2.5 above. At 3.0, 100 and 3.5 and 4.0 lose 150 batts/bots.
A way a lone a last a loved a long the riverrun, past Eve and Adam's, from swerve of shore to bend of bay,
brings us by a commodius vicus of recirculation back to Howth Castle and Environs.