I'm working on a pattern right now for a trainer that would be perfect for what you're looking for I think. Especially if you're using prefolds now. I'm not quite to the point of "going public" with it yet as I'm still tweaking it. But details are coming soon! .....
Let us know!!
Proud Attached Mommy to My Beautiful Baby Boy!!