Ittis, swaddlebees, Lotus AIO (but not being made anymore, so hard to find) are all trim, narrow crotch AIOs or AI2s.

I find Berry Plush (AI2) and BumG (one-size pocket or sizes AIO) are trim wide-crotch nappies.

I do still have to size up in pants though, but that's mostly because Euan has a very long crotch.