I'd switch if I were you - well, I did, after holding out for what I thought was a long time. A lot of minor nuisances I hadn't gotten around to investigating with X just disappeared, I think you'd find that by comparison you were/are actually nearer 'not working' than you realise, my sway experience has been much smoother.