I don't think the OL is that far off. One, the scheme will be better. Two, yeah the move is over and any issues related to that behind them. Three, Havenstein not dealing with offseason injuries keeping him out. I still like him a lot.
Personnel wise, I move Saffold to LT, sign a FA OG like Warford or Leary, and draft a center in the 3rd or 4th. Brown and Wichmann compete for the other starting OG spot with the loser joining Barnes as the top interior backups. Then find a veteran OT in the later parts of free agency that can be the 3rd tackle and serve the role Reynolds did in 2015.
I would dump Robinson for a late round pick personally. Draft a LT in the 1st or 2nd round of 2018.