Just seen this thread, if you fancy staying the open source side of the fence then a System76 Lemur Pro might do the trick. They are intel based but the roll their own firmware, hardware and OS....