You may be interested in reading this post recently posted on the forum. I think ir is not dissimilar to what you are asking and thought I would send a link in case you didn’t see it. I agree with Steve2 you seem to have things in hand and I hope you can get things sorted out to your satisfaction.
Best wishes
Tot