I did the same, bought an XPS 13 become it seemed everybody would recommend it but got many problems (battery died, wifi range is very low, suspend on disk not working, no hdmi, ...)

I then discovered Clevo, they sell very customizable laptop where you can have crazy specs (two HDD, 64gb ram, latest i7) for very reasonable prices (compared to apple). I'm waiting for mine but it seems like the perfect solution.

Also, that's what System76 and many "custom linux laptops" shops sells but under other names.