This is very close to what I do. I like the added flavour of a small amount of the syrup from the Luxardo cherries. I also use a dash of actual Luxardo maraschino liqueur alongside the orange butters; it adds a nice “woody” flavour but it needs a delicate touch as it’s a strong flavour that can easily overwhelm everything else!