Have you tried Cloudflare Workers and Workers Sites? I believe they fix both issues.