I was about to suggest apple cider vinegar but someone beat me to it! If you add some to a lukewarm bath (absolutely not hot water -- you don't need more heat on your skin! and not cold water either, since it will be a real shock to enter cold water), it really takes a lot of the pain out. The scent goes away pretty quickly after you dry off. And even if the scent lingers, it's better than the pain.