I use a crate for Duke. When I first got him I was bringing him to work daily with me since he was so small I new he couldn't hold it to long. Aside from the fact I didn't want to leave him.
Once I started leaving him home I got him a little larger crate to make sure he had enough room (but not to much) and he's been perfect in there. Sounds like you have a nice set up though. Good luck.