Andromeda, that's a good choice. However I'm still going to buy the TI too, but you can't go wrong with the andro either.
Andro may not sound very attractive in a music store if you just try the presets. They're boring. It's a synth for tweakers and you have to spend some time with it to see how it works because it's too complex at the first sight. I have used one for 2 years now and love it. It sounds alot warmer than the va synths (of course). The modulation possibilities are almost endless and so are the filter routings, envelopes and oscillators. I like the idea that you can use 1 or all the waveforms of the same oscillator at the same time. And the inverted saw is sometimes very useful. You can expect alot warmer and "alive" sound from andromeda compared to virus.
Btw, don't use the auto tune at all. It can sometimes loose one or two of the oscillators/filters. Let the synth warm up at least 15 minutes and it will be in the right tune. If it still remains out of tune, auto tune it, but you don't need to do that anymore.
And the reason why I didn't buy any more vintage analog synths is that you cannot be sure when they're gonna break. Those things are 20-30 year old. I sold my Juno106 because I was terrified when I saw what was inside.