Buying a new Lenovo

Long story short, last year I needed to upgrade from my beloved ThinkPad L420 that I had for so many years. I decided to buy an IdeaPad 130 because I thought I'd lightly use it at home.

Then came the pandemic and I'm still working from home 6 months later and this thing just can't handle the workload.

So, a few questions to you ThinkPad loyalists:

1) What do you all think about the X1 Yoga? (side note: older model, 3rd Gen, Intel i7-8550U, 16GB RAM, 512GB SSD) - > I can get it for roughly $900, which is about the most I'd like to spend.

What is a comparable T series ThinkPad for that price?

2) Is $900 worth it, or should I take a gamble and wait for potential Black Friday deals? I've never shopped laptops in that time.