Automations - "Wait" element time ranges

On our automations we want to use Wait elements to delay email sends, but we also want to keep the Wait within a given time range - such as between 8am and 10pm.

Currently, we can only set for a "Wait until X time" option to try and prevent 2am sends on a Wait for 3 hours, but if a user signs up after 8am that will force a whole extra business day to Wait for before the email is sent!

The feature could be called "Wait until time is between..." and then give the user the option to select two different times to form a range that the Contact/Object will advance from the Wait element after the initial Wait period is over and still within that range. If the Wait period takes the Contact/Object outside of the time range end, it waits until the next day at the time range start to advance the Contact/Object to the next element.

In addition, I'd like the option to use the Contact/Custom Object's timezone instead of the account timezone.