Your holistic solution here if you don't want to fight with Sites is going to be to migrate to the more managed solution, Pages: https://pages.cloudflare.com/