I missed the weapons proficiency, I thought you meant a +2 to hit generic and separate add. I am okay with proficancy, you can't get double and it doesn't stack with itself and it would open up some interesting new options like mages staff fighting.
Sorry, I didn't flip flop I just miss read...