Yes wait till 18.04 Ubuntu 17.10 is only supported for 9 months. Ubuntu 18.04 is going to have big changes so I suggest an clean install. Meanwhile
Boot the install CD and go through the install process as usual. Use the SAME user name and when you get to the partitioner, check the box marked "Manually select partitions" and click forward. You'll see your old setup. UNCHECK all the 'format' boxes and mount the partitions in the same place they are now. As long as no 'format' boxes are checked, no data will be lost and system files will be overwritten with the originals. You'll need to do security updates again.