My next order should be....
Check out Upton:
They touch all the bases, and are really good about selling samples. Judging from your tasting notes and cupboard, you seem experienced enough to be able to select good options from their catalog (all 56 pages)
I’ve only sampled a few areas of their catalog. I love Keemun and can recommend the ZK25 Keemun Dao Ming and ZK67 Mao Feng Superior. I’ve had a bunch of their Darjeelings, but my favorite in that style is from Nepal: TM56 Mist Valley. I’ve had a number of their Decaf teas, with mixed results.