If you are okay with a non-stay-dry lining material, you could check out the Swaddlebees Eco-Nappi -- it's a OS pocket, generously sized (will fit longer than your BG 3.0 OS), with an organic cotton velour inner. The included insert is 2 thicknesses of hemp and one thickness of organic cotton velour, in a snappable tri-fold design that dries fast. I have been impressed with the quality, and it comes in either snaps or velcro closure. It's a pricier diaper, but I do think it wears well (especially if you go with the snap closure).
(Note I did have early issues with leaks with the first one of these I bought -- Swaddlebees replaced it and I have had no trouble since... in fact I've purchased a couple more.)