It’s fine if you have the manual rules, UPnP does not buy you anything else. I just wanted to make sure you had them.
The 504 and ETIMEOUT seems like it’s simply not getting through for other reasons. Now this sounds as if the firewall is blocking it. E.g., the same error here, and was solved by changing firewall rules: