So what kind of Decca and Primo did you actually purchase in Eqypt?
As for transporting through a Muslim Country and getting stopped and being allowed to continue you are either a very very lucky man or your memory is distorted. Anyway as for the UK law for medicines obtained abroad, the key issue is the legal status of the medicine in the country of purchase. If it is available OTC in that country then up to 3 months supply could be brought into the UK(as long as it is not also classified as a CD within the UK) and the person could be in possession of, and use the product without breaking any regulations.
So no need for shampoo bottles etc etc. Also no risk to enter another Country
The authorities already caught and busted the group that had the tunnel across (under) the TJ/Cali border several months ago. It was a big deal in the news here.