Seems to me you're a pretty experienced audiophile and already have a pretty solid sense of direction. You might just want to go with the options you're already considering.
I think you've got some good recommendations. And I'll add another, below. One thing I think you should consider is whether the equipment you buy is hard wired or employs the use of circuit boards. For myself I prefer point-to-point wiring and tend towards small, boutique or semi-boutique specialists.
Consider that probably much of the advice you'll receive (including that which I am about to give you) will be heavily biased in favor of the equipment that the person giving you the advice owns. Let's not "call anybody out" for this, like there is an intention to deceive. I think it's reasonable to simply recognize it. In a way, it should provide some confidence that those who are chiming in here at least have some familiarity with the equipment they're talking about. Consider, though, that probably nobody has been able to compare all the options being discussed. And even if they had, their listening preferences might not be the same as yours. And, of course, the context of your system is what really matters.
Having said all that, I recommend a Supratek. If you do a search for "all time most popular threads" you'll find the "preamp deal of the century" thread, which is now approaching maturity, as it is almost 20 years old. One of the things that attracted me to Supratek was the fact that many who posted on that thread had previously owned many of the well-respected brands we are talking about and felt that Supratek was sonically an improvement over what they owned before.
But whatever you go with I expect you're in for a fun change.