One thing worth mentioning would be try to get a receipt for any cigarettes that you do buy if possible. You're not that likely to get searched going back into the UK at customs but it does sometimes happen and if you don't have a receipt they will just assume you bought them without paying tax. ie from a dodgy source.