So I just had the following thought on re-writing Crossbow Expert (though it might be too fiddly):
Crossbow Expert
Thanks to extensive practice with the crossbow, you gain the following benefits:
You ignore the loading property of crossbows
You are proficient in using the butt of your crossbow as a bludgeoning melee weapon. A hand crossbow is a 1d4 finesse weapon, a light crossbow is a 1d6 finesse weapon and a heavy crossbow is a 1d8 heavy weapon.
If you hit with a melee attack on your turn you can use your bonus action to make a ranged attack with a crossbow you are holding. Being within 5' of a hostile creature does not impose disadvantage on this attack roll.
You can use a bonus action on your turn to brace and aim a crossbow, granting you advantage on your next attack roll with the weapon.
This gives crossbow wielders a way to still mix things up in melee without abusing Sharpshooter and Archery style, makes the feat good for more than just the hand crossbow and gives them a distinct flavor from a bow-using archer.
Not sure if the last item is too much, though (and I realize it overlaps with the suggested revisions to Sharpshooter.)
