You've probably explained this elsewhere, but because I'm unobservant: What is it about the diapers that troubles you the most? Is it a mechanical thing (like hiding them), or something more complex (like finding an accepting partner)? Or all of the above?
I have to agree with Trevor, though: Finding a way to integrate it--or at least make a simple habit of indulging it--is best. They say that "you always want what you can't have." Well, it also happens that "you don't always want what you can always have." That's where to look for relief, oddly. If you keep diapers handy and make it easy for yourself to indulge the need for a diaper as soon as it comes along, you'll find yourself a lot less preoccupied with diapers. Strange but true. Or at least that's been my experience.