I'd say remove his scope and charge mechanic and give him iron sights, on scope-in, then give him a sweet spot of sorts where his headshots deal the most damage, say about 1000 HU, and it goes up to and then down from that point, then increase his reload speed to have him fire about as fast as Spy's enforcer. To make the increased firing speed fairer, have him only deal 150 on headshot at 950-1000 hammer units, 120 at 500-949 and 1001-1200, 75 between 0 and 499 and remove the headshot bonus past 1200 HU. That way you can absolutely clean house if you're good at gauging your distances, while still being effecting at longer ranges while not demolishing an entire team and shifting his focus to midrange combat.