There is an easy fix to all of this. Change how recovery works. Instead of having recovery start after a period of time with no damage. Have shields recover a set amount per second based on recovery.