I tried the update again, first using the Joomla Update then then using the package install process.
Both times I got the 504 timeout issue. When I restored, I had to restore the files in order to get going again. I tried the database restore first and it still gave me the error.
I have created a Test environment that I can give you access to if you want to do some investigation to work out what is going on.
Thanks and regards