Sorry that happened. I was thinking "pill box" till I got to the end and saw you already use one. Hmmm. The only thing I can think to suggest is what I do, that started at a point where my prescriber was changing my meds a bit too much and I was getting a bit flustered from my usual easy fill routine... I physically separate the bottles of am and pm before I start to fill the am and pm containers. The ones that are both am and pm I put in the middle. My am and pm containers are separate entities. I fill the am. Then the pm. So far, so good.
(Apologies if you weren't looking for ideas...)