I agree with your assessment. Turkey and the US will get back on track on the F-35s. The best option for Turkey to induct F-35s while driving parallel indigenous development of their own fifth generation aircraft.This was political decision,had to be done(to much to elaborate).
We will get the F-35 eventually,no worries there.
This is an imperative given Greece's decision to go for F-35s as well and for as long as Turkey remains within NATO, all sorts of deals are possible on the F-35. I don't think the US wants Turkey to walk away completely either.