I found, 2 months ago, that one of my pharmacy pill bottles matches the lid off of my water bottles! I use the water bottle lid instead now, because it seems to fit a little better, and besides, looks a lot cooler, lol!
Your system sounds really good! :-)
Love All Life, Thank You For Posting! :)