That's what I recommend too. Get a solid frame and geometry with 1-1/8 steer that you like. Upgrade fork later to light better performing unit down the road. Ditto wheels. Keep OEM wheels with more severe tires for off road adventures, etc. Tweaks and improvements will expand the range of places and conditions where it will perform well