I get a lot of what you are saying about being a PC gamer bit, these features that the series 2 will have don't sway me personally towards it.
Its personal preference, both controllers have some great features and they are both great controllers in their own way, a couple of things I will say tho about what swayed you towards the S2, I much prefer the way that you adjust the triggers on the Nacom as Xbox had huge issues over this with the first controller, so the fact that I can adjust it with software is a big plus for me and really stops the trigger being under to much stress, again with the S2 being mechanical.
Also, this tension thing I'm also a little dubious of, as again I think over time this is going to cause a few problems. The series 1 had with loads of people suffering from drift.
I will still be getting on for my Xbox as I love the original but I really do hope that they have done a better job this time around with the mechanics and not overdone it this time just to get sales with what they claim it can do.