Might just make sure your current pads aren't glazed, try roughing them up with a file. Was never a fan of the M-system pads either. Maybe clean your rims. If you're willing to change your levers, I'd think changing to linear brakes would be a good way to go (at least easier to setup).