I'd remove the NULL in the first button macro as well, since that macro won't progress past that point until you drop combat (i.e. no good for target switching during combat).

Or you can change the reset condition to reset=combat/target, but then you might be stuck waiting for cooldowns...

Cheers,
S/