Furryous, you were absolutely right!
This is what happens when you write Macros at 4am, you make silly mistakes. I lost a tonne of flexibility by tieing these together, and the macro has now been destroyed, never to be seen again.
I have had something of a revelation though.
I've re-sepecced to Arms.
For whatever reason, be it that Arms fits my playstyle better, I just get the rotation off better, or maybe using a single slightly poor quality weapon is better than using two slightly poor quality weapons, whatever the reason, I've gone from doing around 35k to around 50k.
Problem solv