I think so too Elly. It wasn't just last year's USO that drained him but the whole thing of winning Olympic Gold on top of his huge and emotional disappointment at losing at Wimbledon. This year he's had time to recharge his batteries, both physically and mentally, and I believe he's psychologically in a better place now than Djokovic is.
The other big difference is that he should be a lot fresher this year anyway as he reduced his playing schedule earlier in the year and then had to curtail his clay court season. Add his 5 days in the Bahamas. I agree with those who think he'll be ready for Montreal.