> Can I keep original configs and only overwrite the specific files I have in "files/xxx"?
No, the upgrade does an implicit backup, flash then restore the backup and that will overwrite /etc/config files with the originals.
Solution: don't keep settings but be sure to have everything set in files/etc files/root ...