The second idea is perfect.

That way you have something on hand to relieve stress and headaches when working on recalcitrant hardware.