I don't know about Mr. Toad, but I'm actually more worried about Pinocchio existing much longer at all, what with that one petition at Change.org to remove it after Splash Mountain because it seems to suggest child slavery, which circulated online for a time. I'm just glad that petition didn't get a lot of traction. Or maybe they're just laying low, biding their time.
I wouldn't mind so much if they just removed the "jackass" dialogue so much. You could just have the Coachman say, "So, you blokes choose the easy life, do you?", which is one of the random lines you hear in the ride.