I vote for your first suggestion and here are a couple of special tools that may aid in this. Check out part numbers M0003 and M0004. Depends on what yr. your engine is.

http://www.autospecialtytools.com/cgi-bin/dyn.exe?doc=sirtools9.dht&