I agree with the suggestions above, and I can tell you that neutering doesn't stop leg lifting.
Max has been lifting his leg since he was 13 weeks old.
When we were done with the xpen, we moved the pad about 6 inches away from the wall. Now he does a ballet move with one foot off the floor, but it is kind of a squat. He still lifts his leg fully outside.