*WHEW!*
Sounds like a plan!
Don't forget extracts/spices (a little goes a long way) as/if you can tolerate them. I even put a shake of cinnamon in my vanilla to occasionally get a different flavor. I have found lemon and orange extracts to be useful as well.