I'm around 1420 and I am using the same team, except I added Coballion into the fray, but that aside I'm not seeing much difference with XY OU and ORAS OU. I still find protect Diancie best since it makes the ever common Lando-T a liability, and wastes one turn of weather. I admit Greninja is a pain, but he was already a pain prior, and the best I can do is to catch him off guard with one of my scarvers or priority but I run an offensive team so... I don't think offensive teams in general have very good answers against him. That said I'm still not keen on Magnezone as a partner for MDiancie as they don't have a good synergy, and I still prefer Coballion for that reason. I know you want to trap Scizor or Ferro who can be a pain but I find a choice locked Magnezone is taken advantage of too easily, that and I do feel many are more wary of trappers.
Edit: Frankly, I have more issues with the rampant BP centric teams, with Scolo or Smeargle. I see that as being the key difference with the merger, as suddenly these teams have gained popularity again.