I have the same issue with my super tuck and an XD40. When I'm just wearing a t shirt, I tough it out. When I'm dressing I wear a 'wife beater' (man I hate that name but everyone know what I mean) as an under shirt tucked in and the dress shirt is tucked according to need with the holster.
Hot sweaty weather down here in Central Fl makes it even worse. The up side is I don't think the checkering on the XD is as agressive as on the Gen4.
YOu might try a gunsmith that can 'smooth' the checkering on the grip so it isn't so agressive, but then you're giving up purchase on the grip when it is really needed.