I think neutering would probably help. He's at the age you should do it before he gets any more hormonal and starts marking.

He sure sounds like a handful but he's a cute handful.