I don't bother taking them now as they are just clutter around the house. I use eye-shade, ear plugs and toothbrush and leave the rest and bag in the drawer.

A woman has a stall on a small soi I walk down to my local BTS station in Bangkok and she sells a small selection of amenity kits. Had BA ones there the other day but mostly Finnair for some reason. I saw she had some Etihad ones still in a clear wrapper so I assume all the ones she sells are new!