Instead of working on your buff macro there is a addon called Smartbuffs, very easy to set up !