I would agree with how you and the manufacturers match the gloves.
The only thing I wanted to mention is, that the 1X and 2X are not completely the same and with playing mostly the 580 in the past, I see certain features in the 2X.
Picked up my custom 2X set yesterday.
Mods: Powerlite (2S) stiffness, Square Knee-Block, Removable Knee Wing, HAL Strap, Skate-Lace Pocket, Colors (Navy, Royal, White, Sportgold)
10 Weeks is a nice turnaround time in Switzerland.
To get a feel based second opinion
Agree:
CCM 580 = Brian's Subzero = Bauer 1X/2X.
Don't Agree:
CCM 590 = Bauer 2S
For me the 2S much closer resembles the CCM 600
Don't know Vaughn enough to comment there.