So you're upset because you refuse to put a change of clothes in your carry-on as your knew you would want to change and then tried to bring illegal substances into a country and it was confiscated? Seems like a top priority for the Sheikh.

Protip: Always carry at least a fresh shirt and undies in your carry on in case you need to change or your bag is delayed for some reason. It happens. Also never put anything in your checked bag you cant risk losing. Bags are security checked all the time.