Yeah Pot of Duality did cross my mind for removal when I viewed your deck but I figured with two copies, it should be useful. My best friend also runs Samurai - I'll duel him over the weekend to see how things run.
As for level 4 Xyz you have Roach, Utopia and in one week, you can grab Wind-Up Zenmaster. That should be plenty.