Hi Louis,
We have similar deployment for our some web sites. I configured Forwarded Connections setting to use "All IPs" list instead of "Proxy IP Group" under On-premises WAF.
As I observe, there is no problem with this configuration and it works well but I am not sure whether this is a best practice configuration or not.