Yankee, would the first option work in this situation? The Pro Shop will only compare your club if it considers it to be the same. "Wedge" != "60 degree wedge" just as an example (although I'm sure you already knew this). Would his old clubs be considered the "same" as the current clubs?
If not, the bag option will obviously still work.