Erm Patrick, this thread was more or less used for Sw1sh's team and to gain feedback for his team. If you have trouble with a certain Gym Leader/battle, you should post in this thread -> Official Gym Leader Help Thread. I'm gonna quote what I suggested in that thread here, with minor edits.
Looking at your team, your Machamp should be able to take on the Normal types such as Cincinno and Porygon-Z and your Raichu/Greninja should be able to take on Swellow.
The rest of Noel's team is composed of Wigglytuff, Girafarig, and Clefable. Being said, your team needs to have certain types to counter those mons: Electric, Steel, and Poison.
Steel types you can use would be Klingklang, Magneton, Durant, and Escavalier. Poison types you can use would be Weezing, Garbodor, Muk, Crobat, and Scolipede.
The removal of Staraptor from his team makes things easier imo so you shouldn't have that much trouble after picking up some of these mons and replacing them with the ones you feel aren't doing much. Good luck.
EDIT: If you need to know where some of these mons are located at, check out Sky's Pokemon Location Guide V2 and Notus's Reborn EV Training Guide if you need to see the encounter rates/time of day for the mon you're looking for. Also, if you are interested in some breeding for a better team later on in the game, check out Etesian's Breeding Guide / Recommendable Sets.