Just to follow up and say thanks. I used this exact approach and got everything working - I moved everything to Glimmer bar the modal itself which needed the Mixin.
btw, bufferedProperty seems to perform a lot of magic and doesn’t seem to follow any of the standard rules related to passing of changes!