I finally found o-rings that fit properly. The Japanese Standard S18 fits both top and bottom seals. The only problem is that they come in lots of 100, but maybe you can find smaller lots. They fit, I'm happy, and lol, I'll never have to buy any more.
JIS S18 ( S 18 ) VMQ PVMQ SILICONE ShA...