I just went through this process and I think I spoke to just about every vendor out there. Good luck ordering a factory engine directly (rebuild or new) - they told me I should buy an engine from them as quickly as possible and if I found something better I could sell it for more money down the pipe since demand was that crazy. No idea if this is true.
Check with Danny at Steel Aviation. He helped me find an engine that he had an order. They just finished her yesterday, actually. He had a another engine ready for a job shortly after mine, but I don’t know if he sold that slot yet.