I believe you are on the right track.
HD might also have a cheap circuit toner, or continuity-style circuit tester (you plug in a loop at the remote end, and the reader on the closet end ... move jack-to-jack until it sees the loop device on the remote end).
Good Luck
Scott