Man - you guys are *awesome* - thanks for the quick response.

FYI - both options (updating the checkout form and securepages approach) work.

I ended up modifying the securepages settings and undoing any code changes.