Once your Noibat evolves to Noivern would be very heplful, with his high speed and sp.atk, also it will help you with the fighting gym which is the next one after the ghost one i guess. Maybe you want an onyx if you want a high defense pokemon an can be evolve to steelix with link stone plus metal coat.
If you want an electric type you can get an elekid (top of a builing next to Corey's gym in thunder days), emolga, electrike (raiiny day next to the 1st gym) and pichu (top of a building close to the 2nd gym).
I dont like grass types very much but there is a tropius available in sunny days in the forest where you get caught buy nuzleafs, also you can get nuzleafs in windy days if i remember well.
Besides that, i think your team is pretty good