As an update I did this:
http://pastebin.com/FcVTCRA4
Obviously it's only the player, I have to raid or I'd finish the other units. Relevant tags I made can be found here:
http://pastebin.com/KGfZFXEA
I appreciate both of your initial, and hopefully ongoing, feedback.