> I'd love a return to the old snap-fit plastic cases.

Fairphone is worth a look for this: https://shop.fairphone.com/fairphone-5