Unfortunately it's not going to get better any time soon. Supply and demand. If they have it, they know you'll pay for it. Every company is running into supply issues now. It is crazy to me seeing lead times of 16-20 weeks. I used to always use 8-12 weeks as the worst case scenario.
I almost wish it were only 16-20 weeks for some items. I'm seeing closer to 38-50 weeks on some CPUs & HMIs.
Neither is acceptable - but it is up to the customer to either stick with what they want or allow us to change to a manufacturer who has stock. Nearly every one is opting to wait when given that choice.