Trouble with Stubble

So my spouse is pre-everything NB, considering hormones sometime in the future. I am straight cis F. They've started shaving their legs and body hair, which I mostly don't mind except their stubble is really irritating when we are trying to cuddle. I miss the days of their longer, non-prickly body hair. I want to clarify that I don't mind them shaving, but the physical sensation of their stubble itches and generally feels unpleasant. I've tried to ignore it without success. But I also know that shaving helps a lot with their body image, so I don't want to ask them to not do it. I don't know, is Nair still a thing? Waxing? They did try waxing and did not like it, but maybe some kind of hair removal cream would work better? What have others done?