I can relate about "Umbrella." Over the summer, in order to play a good song on the jukebox (and have it come up in under an hour) you had to also play a crap one. Inevitably it was Rhianna. I'm just grateful it wasn't something really aurally offensive.
Try some Joy Division or New Order. I'd suggest Disorder, Ceremony, Age of Consent or the perennial Love Will Tear Us Apart.
It's my palate scrubber, no joke.