I think Querrey is playing Eastbourne so we might get a rematch. Have to say Querrey has been having a stellar season for his standards, and has beaten both Djokovic and Nadal in the past 52 weeks (which I think only Thiem and Del Potro can brag about.)
Even though Eastbourne is just a 250 with only one top 10 player (Novak) and one top 20 (Monfils), it's actually a pretty strong grass-court field. Besides Querrey, also entered are Isner, Johnson, 2-time Wimbledon semifinalist Gasquet, the serve & volleying Zverev, and F.Lopez. If Novak wins the tournament, he will gain some confidence, although that confidence will help him only in the earlier rounds of Wimbledon, not in the SF & F where Novak will likely be facing a different caliber of opponents, like Murray & Federer.