It sounds like he's really trained well. Why not get an exercise pen? They're awesome! Plus, it will give your baby more room than a crate. Check out
www.petsmart.com and/or
www.petedge.com
You can put his bed, food and toys on 1 side and his a wee wee pad (just in case) on the other side.