A general observation: using [@focustarget] instead of /assist focus will make those macros cleaner, and possibly even allow you to merge the tank based & focused based macros into a single entry. Just decide whether you want to default to DPSing the tanks target or DPSing your focus by default, and set the order of the conditionals appropriately.