Naomi:
Todah Rabah! I envy you that you can be ready 20 minutes before Shabbat... I often am trying to get ready until 5 minutes before.
I like your solution a lot, and will probably use it in a bunch of places.

Jerry