I guess all my Yanis are pretty old.The original poster is asking about a comfortable modern curved soprano. A modern Yanagisawa is a completely different sax to that S6, and in my experience, Yanagisawa saxes have pretty much the best ergonomics of any brand of sax.
Curved ones are pretty cute, and they're great for travel, but they've always been just toys to me. On gigs and recordings, you can't beat a good straight soprano. If it were me, I'd go for a modern straight soprano.
On the other hand, the soprano player in my quartet has always played a 22 and never had a problem. So there's no reason one couldn't just stick with the 22 indefinitely. Aside from the left pinky table, the ergos are the same as a modern horn. Yes, the modern pinky table is fantastic, but only an advanced player would be able to appreciate it. Many don't understand it enough to exploit how the G#/C#/B/Bb linkages work even when they have them.