Surface Pro 4 Screen Flickers

I have the same problem as many other Microsoft users (summarized below)

What is Microsoft's solution to resolve the Surface Pro 4 flickering screen?

ISSUE

Due to the pandemic, I now need to work remotely and use this Surface for 8 or more hours each day.  The first full day was a surprise when my screen started flickering.  I see that Microsoft knew about this issue and arranged to extend the warranty to 3 years.  Unfortunately, my Surface Pro 4 is just past the 3 years.  I feel that since my Surface was registered when I bought it that Microsoft should have notified me that my Surface was in the batch of known hardware defects.  Had I known about this issue, I would have taken care of this issue immediately.  Instead, I was left to discover this on my own over time.  Now, Microsoft support has offered to replace my Surface with a used certified Surface for an additional $599.99 with only a 90 day warranty.  I don't really want to spend an additional $599.99 but I will if I have to so I can continue to get some work done.  I have 2 issues with this, one is that Microsoft had my contact information from my registered device and never contacted me to say I had this known hardware issue and second is that after I spend $599.99 I will get a used device with only a 90 warranty. 

1) What is Microsoft's resolution to this?

2) How do we implement the solution during the COVID-19 crisis?