[Next_rim]

I want to break my hotkey setup for more flexible army control, and have been failing to do so.

My current binds:
1 - main army, or sentries on guard at main early game
2 - HT or colossi or mommaship, or early game harassing party and poking/scouting stalkers.
3 - all warpgates, or in PvZ, mapcontrol phoenix/harassing voidrays.
4 - all nexus
5 - tech production, all stargates and robos
6 - observer/warp prism
7-8 - other observers or important mapcontrol units, like DT-s, or harassing zealot party.

To navigate around map I use double-hit on Hkey to recall a group. For example, I hit 4 twice to get to my main base nexus, and navigate with mouse scroll from there to respond to drops, order upgrades, build pylons etc.

In the beginning, I also use 1 and 2 to bind important probes (scouting, or current building probe).

I'm fine in PvP and PvZ due to low variety of units, especially in PvZ, when I don't use warpgates till like min 16. I can easily split army between 1 and 2 and have a good grip over it.

However, in PvT lategame, I have hard time controlling my stuff when army has both colossi and HT. I am now binding gateway units+colossi to 1, and HT to 2. But in combat, if I have to pull colossi back, I make mistakes like pulling whole group 1 back, or not selecting all colossi, and end up dispositioned.

I want to break my binds without breaking my fingers, and I want to free up 1-3 for army, and relocate production to 5+ for all matchups. I've tried several times in custom games, and it feels so stupidly hard. And I don't dare to do so in ladder games, because there is already enough things to do other than thinking about where did all my warpgates go.

Any tips and suggestions?