Expanded (Post-GDR) Yanmega BREAK + Garbodor (GDR)

[Elray]

After being inspired by the Yanmega/Decidueye post, I decided to make my own Yanmega BREAK Deck.

This is my current deck:

Spoiler

Pokemon: (21)
(4) Yanma (PHF/STS)
(4) Yanmega (STS)
(3) Yanmega BREAK (STS)
(2) Blitzle (BKP)
(2) Zebstrika (BKP)
(1) Spinarak (AOR)
(1) Ariados (AOR)
(2) Remoraid (BKT)
(2) Octillery (BKT)

Trainers: (35)
(2) Professor Sycamore
(2) Professor Birch's Observations
(1) N
(2) Judge
(1) Teammates
(4) VS Seeker
(1) Trainers Mail
(1) Lysandre
(1) Skyla
(2) Battle Compressor
(2) Revitalizer
(3) Forest of Giant Plants
(3) Ultra Ball
(2) Timer Ball
(1) Level Ball
(2) Muscle Band
(1) Super Rod
(1) Assault Vest
(1) Professor Kukui
(1) Rock Guard (ACE SPEC)
(1) Wally

Energy: (4)
(4) Double Colorless Energy

I'm trying to integrate the new Garbodor into this deck because of how ridiculously good it is. My strategy would be to get Yanmega BREAK into play on turn 1 and set up Octillery and Garbodor on my bench.

To reflect this strategy, I've come up with these changes:

Spoiler

-2 Blitzle (BKP)
-2 Zebstrika (BKP)
-2 Double Colorless Energy
-2 Muscle Band
-1 Professor Sycamore
-1 Spinarak (AOR)
-1 Ariados (AOR)
-1 Rock Guard (ACE SPEC)
-1 Assault Vest
-1 Super Rod
-1 Professor Kukui
+1 Escape Rope
+1 Rescue Stretcher
+1 Choice Band
+2 Field Blower
+3 Trubbish (GDR)
+3 Garbodor (GDR)
+4 Psychic Energy

Would I be making the right changes? Any other suggestions?