I think increasing the recharge rate while standing still would be a good compromise.
It can be upgraded and makes less of a problem.
