One additional thought worth considering….you could try a shorter pair of cranks if you do’t want to move your saddle closer to your TT position.
This would have a similar effect of opening your hip angle, which seems to be the root of your discomfort.