Ideas for reparameterizing models/changing priors to avoid divergences

I see what you are saying, so if we wanted to use a hierarchical model we would have to rewrite the model in such a way that the baseline value is removed beforehand.