I had a bit of a play around with Key bindings and Bartender and got the drink thing sorted out, seems the default bindings were causing Win1 to press 1+= together so I've got everything just bound to Bartender hot bars now.

As for the targeting thing, I've sort of gotten used to it.
Macros...
/target <Main name>
/Focus

/follow focus

/cast [target=focustarget] lightening bolt
Same with shocks

It pretty much sorted itself out after I messed with the action bars, oh and changed my script a little.
It was basically: when oom and going into melee I wanted him to turn and keep attacking but he kept going back to facing me but as I said the new script must of fixed it.
Just I couldn't find anywhere on the old script that there was anything making '1' follow so I threw it out.

Sorry for wasting forum space and time, I guess I got it myself in the end.