Looks good to me, try running $ df -h after a reboot to check it’s expanded
I would recommend using the backup module to export your data then re-importing once you have booted the new image, see:
I would recommend downloading and flashing a fresh version of the latest image with Etcher then importing your data. Using the backup module. See above.