I'll be opting for a Darter Pro from System76 later in the year. Like others have stated, going with FOSS hardware/software isn't cheap, but it looks to be the best compromise for myself.

Dell's XPS "Ubuntu edition" looks like a great device. However, limitations on repairability at that price are a non-starter for me.