Once personal proxy relays are a thing this problem will be greatly alleviated.

Your client connects to your one personal relay (which itself connects to other relays). Fewer connections from the edge device and greater flexibility re: caching and data transfer since your totally control the relay.

Also get IP cloaking for free if you host the relay outside your house.