Did you try Insurgo?

https://insurgo.ca/produit/qubesos-certified-privacybeast_x230-reasonably-secured-laptop/

I have great exp with their support. Been using it as second laptop 4.5 years. But of course keeping Qubes OS etc working is pain (updating drivers, etc)