Another wool/fleece convert here
... they're so much prettier than "normal" trousers, and will solve all your problems with wraps leaving red marks. If you don't want to go that route though I highly recommend PUL shorties (like Stacinators or, better if you can find them, Lovebums).
I second using fleece or minkee liners too, DD is all right without them during the day but overnight she absolutely has to have one in or she gets horribly red.