What I would do is completely remove the bonuses from Expertise. The Expertise abilty does not increase your bonus on any skill it is applied to. Instead what it does is it adds another 'tier' of capability to the skill. So you now have Unproficient, Proficient, and Expertise as tiers of skill...