@J273
I had the exact same issues as you and I just created an advanced tutorial that might solve your problems as well. By using a Virtual Motion Trigger, you can simply disable the autonomous flow by disabling the Virtual Motion Trigger before you dim the lights to its desired Brightness. I Also use a circadian zone for all my lights. I use its night mode and the manual mode to keep dimming autonomously but with different values for different times of the day as well.
This is how I completely tied it into my home together with presence:
