Andrew is right, a smaller bore might be the solution & very few people actually do take the trouble to do a bed in, I just figured it was worth mentioning as it is helpfull. With the MC potential dealt with just me I would get some agressive specialty shoes, they wear out the drums faster but you'll be alive to enjoy it. (sounds like you are "alive" now with your near misses!)