I think instead of just picking which categories your weapon proficiencies go into they should be assigned depending on which weapons you use.
For example: My character has 145 two hand prof and none in other spots. If I start fighting with a polearm instead of a two hander, my proficiency points should start shifting to polearm.
You would not gain or lose proficiency value, but could switch where they were allotted.