I have to say, I'm getting pretty concerned about his form right now. His record in the big events this year is now R4, R2, WD, R3.
Even as a huge Andy supporter, after last year I just can't bring myself to be anywhere near getting in a tizz this year.
These last two days clearly have a lot to do with rustiness, particularly on serve. So if the elbow is OK, a WC entry next week indeed looks a good plan
Still be #1 seed for Roland Garros - even if Novak wins everything in between including flinging in WC entries.
In theory Andy is not guaranteed to still be WR 1 after Roland Garros ( even ignoring the Novak WC scenario ), but I would certainly think he will win enough matches by then to hang on longer ( hopefully better than hang on ) and Novak probably won't win everything anyway ( * actually Stan can reach a theoretical higher post Roland Garros total than Novak ). I expect him to still be WR 1 going into Wimbledon. Then there could be an issue on that score.