In case lighttpd is still running, have a read of lighttpd still running after upgrade for steps to disable it.
Once that's done, you should be able to move Pi-hole back to port 80 on your pihole2:
sudo pihole-FTL --config webserver.port "80,443os,[::]:80,[::]:443os"