Apple hardware seems to be relatively unchanged, or even improved since the keyboards were fixed.
How about current Framework devices, which aspire to be repairable? Hopefully they will offer an Arm-based laptop, tablet or mini-PC.