There are various things that could be done, but it would largely come down to which CloudFlare subscription tier kbin is on and the manageability of all of it. The way it’s set up now looks like a quick fix to address a serious problem. It would take some more thought and planning for a more ideal setup and it may require a more expensive CloudFlare plan. The cheaper plans only allow a few rules and some features are locked. This will almost certainly be cleared up soon.