In hindsight, I probably wouldn't have ran everything on home runs, but being able to patch whatever, wherever is nice. So maybe consider running power and 2 ethernet to certain areas for a POE switch, and then you can branch other runs out from there.
If the WAF allows it, I would go with a...