I like the idea of relying on one weapon, but you are absolutely right a -2 on all other attacks is a bit too excessive, even if it only applies to range/melee, how about making it a -1 adj. instead.