Leasha have you tried some Honeyboys? I can send you a home made jobby (as long as you don't laugh ) and if you think the fit is OK then stalk buyforbaby for more of them!

They are a tad bulky though they were such a good fit for C-dude and he was built like a tank at that age!

Blueberry pockets are great for a OSFM. Itti bittis are deceivingly good for big thighed bubbas too. I'd go the large ones. C has had 2 years of wear out of his ittis!