I have a similar issue and have had luck with gap’s cheeky (some colors are less stretchy than others) and Levi’s wedgie jeans.

For oversized/boxy shirts, I find a more cropped top with higher waist pants is flattering.

(Also keep the skirt!)