hi joey, if you plan on doing 1 or 2 more OM lives before Sw/Sh you may enjoy using this Tier Shift team I made here. it's mainly a balance team but it's still got stuff like Scarf Mightyena which hopefully can do something if you use the team. (check pokepaste to see all the new base stats when used in Tier Shift). hf if you use it! https://pokepast.es/283ea8be7f8958fa