I would honestly just back up my files and start over with a fresh new install. I have never been successful in copying everything over, especially not if you are planning on changing the file systems. I know you mentioned that you don’t really want to do that, but that’s my 2 cents