I like the idea of shifting to a demand-driven model. Unrelatedly, check out https://datausa.io/ if you haven't. Deloitte/MIT created a similar platform for US statistics. Doesn't seem like it's being maintained but it looks pretty/is easy to navigate.