Tension driven :-) I'm not sure there's a "better" way : it has to fit your needs/challenges. Holacracy gives you a framework, but not the recipe that would work with all.
But I would say : why not both ? You could have some "finance" roles scattered in the organisation, and also a Finance Circle. Could be the same partners as well. But different roles, different purposes.