Pretty similar situation here. My S has been great, but unreliable. 3 drive units (and acting up again), second MCU, literally dozens of other issues. It's been in the shop more than all of my previous cars combined, and more than a 12 year old ICE I often beat up at the track. I still love driving it, but am worried about its pending warranty expiration (I have the extended warranty through year 8). I have $1000 just in individual $200 extended warranty copays at this point, and the warranty has paid for itself several times over. I'm especially concerned with how extremely far the service experience has fallen since 2013. It was easier to forgive constant issues when service was painless, but now it's awful.
I had a day 1 reservation for a 3, but bailed when I found out they went with a trunk instead of a hatch. The Y checked a lot of boxes. I'm supposed to be picking it up in a day or two. Hope it works out and the transition is easy.