Always carry your sticks with you...and place them in a travel-dor. I always carry my expensive gear on to the plane with me.... electronics, watches, jewelry, pens etc..
If they want to take my socks/underwear and XXXL shirts....so be it.
That's what I've been doing since that incident. A friend whose watch collection is impressive told me: Till, God gave you two arms so you can safely carry two nice watches when traveling. Don't put them anywhere but on your body.
The only thing I find a bit scary (nothing ever happened though) is when you take them off for the metal scan and put them under the x-ray. I am always afraid someone will sneak a watch out of the tray and no one but me will notice or believe my story.
Till