There's also the Framework option now.

It took them a while to, but they finally offer boards based on AMD chips.

I don't need an upgrade now, but I feel a RISC-V framework is feasible once I do.