I didn't really see a big enough improvement in the 16's to let me pay $1000 for two.  We're good for another 6-7 years hopefully.  I would have kept my Xs (did what I needed it to do) but a few weeks ago, it took a long swim in the pool in Kona and it couldn't be resurrected at all.  Really ticked me off I was so forgetful.