I think your plan sounds pretty good.
One more thing you might try is if they ask you if you have any "sensitive areas" pre-pat down, tell them your crotch area is sensitive - although I think some have reported that this earns them an extra-vigorous karate chop.