for trinity, i know there are options for "states" i think. its under the first tab in the advanced options. id make a bar for "group" play and, if you're in a group, that bar should show. then just keybind the buttons to your 1234567890-= keys.

what i like to do is make each button customizable with shft/alt/ctrl states, instead of changing bars based on modifiers. they work the same, but instead of "shifting" the bar to the next bar, i just shift the option in the macro to the shifted spell. im sure you know this though!

as for your warlock being the main, i dont really see a reason why you'd want to change anything on your lock though. what you might wanna try doing is making your slave sync with your warlock. =]