Tailsitter - struggling to go back to hover in windy conditions

I got some problems with my wing/tailsitter. It’s hoovering pretty well, transfer well to forward flight, flies horizontally, but it’s struggling to go back to hoovering. Especially during windy conditions, when I switch back to Qloiter r it pitches up, shoots straight upwards, and then goes back to horizontal position, due to headwind trying to move it.
How do deal with this problem ?
First thing I can think of is trying to do transition with the side wind, not the head wind. Second thing is lowering the CG as far as I can. Does it make any sense ? Are there any ways to deal with the wind with tailsitters ?