Hawk brake pads - worth it?

I think in your case I would try a tad smaller diameter MC first if you have enough pedaltravel left currently.