In answer to your first question, nope, that's just the way thing are now. As for collecting all the badges, it isn't a particularly onerous task. You will need to find all the grubs to accomplish it, though, so I don't know if that's something that will deter you.