Although I am happy, I would not look too far ahead, especially as we don't know whether back being good is for good or varies on a day to day basis.. Roger should win against Kohly considering the 11-0 H2H and also the fact that Kohly is not exactly lighting up the fire recently.
The QF on the other hand would be much tougher than that, but should still winnable if Fed is healthy. Thiem is basically a clay courter and does not do too well on hard courts and can be rushed to commit errors. JMDP, assuming he has only slice backhand, is beatable too.