Just wait 6 months or so after release....
I own a Surface Pro 3 and a Surface Book. Both have only been improved through firmware updates after release. There was actually some pain points on the SP3 right around release that caused some headaches.
My Surface Book was a spotchy experience for the first 6 months or so. by month 6 it was running acceptably.