K, eum I would take out two masquerain for 2 surskit, you didn't had his basic stage.
I would switch the dark celebis into dunsparce. I would also switch 2 crobats into hidden legends crobat( that's the new set).
Trainers, I would take out 2 town volunteers, all the potions and the weakness...