Option 2 didn't work on previous attempts, it complained with duplicate input.
I'll go with Option 1. Most of the ecommerce package pages (and some of the ec_* procedures) should be upgraded to use /lib templating anyway.
cheers, and Happy Thanksgiving!
Torben