Ok, So I need some opinions. Normally, I only have one of each type in my game, and I currently have 2 of each type. I'm wondering what Pokemon to use in their place. I have 2 Psychic Types and 2 Water Types. I also don't want to use any Pokemon that are in my X Team.

My AS Team:

Gallade (He stays.) (Nicknamed Lucas, has Galladite)
Mudkip (Nicknamed Marko)
Mesprit (Nicknamed Ariel)
Flygon (Nicknamed Drago)
Cosplay Pikachu (She stays) (Nicknamed Krista)
Kyogre (Nicknamed Kyopop.)

I was thinking about using replacing Kyogre and Mudkip with a Sharpedo and a Breloom. As for my X Team,

Froakie (Nicknamed Mark) (Shiny)
Luxio (Nicknamed Citron)
Pancham (Nicknamed Ava) (Shiny)
Noivern (Nicknamed Sayaka)
Meowstic(Nicknamed Hunter)
Vivillion (Nicknamed Koto)

If you have any suggestions, of think I should go through with what I said above, let me know! Thanks in advance!