I'd like to ask a quick question, why was the weapon swapping implemented, is that still necessary for anything?
My experience with warrior is limited to 1900 using this CR and i never played it by hand, but i assumed with the recent changes to spell reflect/Dstance/Shield wall etc. swapping to 1h/shield was no longer necessary?
is the benefit so great that it warranted implementing it to the CR?
The only benefit i can think of is the extra armor from the shield, but i may be completely wrong.
1h+shield is not needed for spells anymore. The only benefit is the additional armor and maybe a tanking enchant on your 1hander. def stance and 1h+shield can help you to last a bit longer till you're waiting on that lazy(or chainCC'd) healer.

If you don't want it, you can turn it off by not setting the weapons or setting it to 0%
Richie