HomeKit and shortcut Wait Limit restriction

Hi I have a Hue motion sensor and have set up HomeKit automation based on time of day (three separate time periods) and LUX levels.

I converted this to a shortcut and added logic that refers to the sunrise or sunset time in order to vary the behaviour in each of the three periods of automation and accordingly to ambient light levels.

However the automation is limited by the system parameters, as once the action (setting the scene) has occurred I can only use the WAIT command for a maximum of 7 minutes and 30 seconds before turning the lights off. This is no good to me as I wish to have the lights on for 30 minutes or more.

Has anyone else had this issue and is there a work around or are apple going to open the window up between HomeKit and shortcuts to greater than 7.5 minutes?

There is also no option in the general settings of the automation (mot the shortcut bit) to turn off after a set time.

This seems like something that hadn’t been well thought through.

thanks

Dave