Improved charge exchange spectroscopy on the Joint European Torus for ion temperature and rotation velocity profiles