I would recommend the following:
cutting Grubbin to three; it is true having four is good for early setup but Grubbin is not the optimum opening Pokemon.
Adding Pokemon fan club; easy way to search Grubbin or Rayquaza-GX so instead of (4 grubbin+2 Nest ball+4 Ultra balls= 10 ways) it become (3...