Note- Since I ride a recumbent, I wear underwear and regular shorts.
I notice problems when I wear cotton underwear and am much happier in silk and/or "coolmax" or similar - so what are your shorts made out of? Maybe a different pair of shorts and/or chamois construction might help.