> Can I work on this part in a different PR?

That works for me.

> It would be nice if there is another metrics_locator_preagg

That's a good idea worth exploring.  I can think of several benefits (isolation, a clear mapping to CF) and not many detriments.