You can edit the original post with your changes you know... And Ninjask really isn't effective in this metagame. You are better off finding a bulkier speed passer with access to Taunt. Ninjask is wrecked by Mischievous Heart Taunt, phazing moves, and basically any strong move. Oh and 4x weak to Stealth Rock.... Not to mention it can't do anything to virtually any common lead these days. Ninjask is just... outdated. To be honest, Baton Pass is really not effective in this metagame until BP +SB Blaziken and BP + MM Espeon are released. But that's just my opinion.
I would recommend keeping Togekiss over Drifblim as Driblim is horrible, and does not do anything better than Togekiss. A Togekiss set with Air Slash/Aura Spere/Nasty Plot/Baton Pass could work, or you could fit in Thunder Wave support somewhere to help your rather slow BP recipients.
I shall test out the togekiss and actually i do not see as many taunt leads anymore they usually have to switch to get it and by that time i will have a substitute out and can use x scissor to kill it unless it is something like an aerodactyle.