As you moved your data directory already, I guess Nextcloud already cleaned the oc_filecache, so solution 1 could not work anymore and shares/tags/comments would be lost. Do you have a database dump in case? If not, just do the occ files:scan --all command to create the new filecache entries.