Hi there, nice team. Like you said, you are weak to baton pass teams, so I suggest running a Sleep Talk Snorlax over your old one, and will also help out against togekiss,which also is another problem you stated.
Snorlax (M) @ Leftovers
Trait: Thick Fat
EVs: 208 HP / 124 Def / 176 SDef
Careful Nature (+SDef, -SAtk)
- Body Slam
- Sleep Talk
This helps out against most of your problems, especially baton pass teams and set-up sweepers, and helps out even more if you have Stealth Rocks up, which can help out against NP Togekiss.