Richie form after great start to season is a bit of mystery so will be tough one to predict, I'd go with Gasquet tho...
Great start of season? well, not so much if you look at the opponents he's faced.
The only top player he's faced was Tsonga and he got beaten pretty easily (and Tsonga hardly played his best in that match).
I watched almost all of Gasquet's matches this year and honestly, there isn't much improvement in his play comparing to last few years and the same big weaknesses subsist (rally FH, not fast enough).
Only real improvement is his mental toughness.