Ah yes, I misinterpreted what you were trying to do; I didn’t read the backscroll carefully enough, sorry!
Yes, you are correct, that workaround won’t handle custom domains due to the way X-Forwarded-Proto gets filled in those situations. I don’t know of a way to handle it with custom domains off-hand.