UI / Keybindings assistance

[Grinthe]

Hey there, I'm looking to smooth out my UI a bit, get rid of redundant things and work on key bindings. Hopefully you can help me.

Affliction:


Demonology:


Here's my two specs, I use 1 - 5 q e r f z and shift / alt / ctrl with each of those for my buttons. I'm having trouble with convenient buttons for all my important spells, for example I ended up using Clique for Metamorphosis and Felstorm (alt + click, ctrl + click) which I feel is pretty clunky. I also want to have better control of my pet for pvp as affliction in particular, I only have a mouseover Seduction and Whiplash macro currently. I'm very open for new keybinding suggestions, macros and even addons if they could help me make my gaming smoother, thank you for your time.