Good idea. And avoid the solder. Wasn't aware that these have limited life.
The life isn't that limited, but they do occasionally fail.
One easy way to avoid having to hunt down shorted ones is to put a series fuse with them. A 10A fast blow fuse should handle any transient spikes easily, and will blow if the TVS fails shorted, the most common failure mode.