Seems to have fixed it - interesting enough my custom “Home Fragrance” routine was working consistently so I think adding a “Security (Disarm)” and ‘Security (Arm Away)” routine to replicate the I’m Back and Goodbye built-in routines works well.
Let’s hope the Good Morning and Good Night routines are unaffected…