Smart period starting after sunrise

I would like for sunrise to be the earliest possible time and then wake up any time in the next x minutes, which seems like a more typical use case. Do I just have to add 30 minutes after clicking the sunrise icon? That makes it slightly less useful, but still workable.

Basically, a shortcut for “as early as possible, but never before sunrise, but still with a smart period.”

support conversation with Marshall