I am in love with the modern puppy crate.... maybe that would be an option for you? My little girl is doing well so far, but Buster my boy is a lost cause LOL... I have to belly band him...
Modern Puppy Welcome | ModernPuppy
It's expensive but an ingenious idea..