XM6 comfort issue

I've had the XM6 for about 3 months now, and I'm still struggling with finding the correct fit where it would not hurt my ears after 30 minutes of wearing. The best I've managed to get it that one ear won't hurt but the other would cause unbearable pain in the upper edges of my right ear.
if there are any tips and tricks to solve this it would be much appreciated, 3rd party ear cushions are not advisable since it will take 3-4 months to arrive in mail