I got a set of gullikits which I believe work both in the oled and lcd deck, you have a switch for which version you’re using. They are great and have never let me down. My case was the same as yours, my left stick had a drift.

Some say the gullikits have a square box and that impacts how it responds, but I haven’t noticed it. Then again, my deck is for couch gaming mostly

Edit: see comment below, the gullikits are not interchangeable

Sadly my gf plays online with friends, otherwise I’d take it of her hands when she inevitably gets a new console. She is thinking of going the steam route, as digital only is not why she plays console