Yeah, I was about to say - Mithrandir cut the scene very well to make them seem like friends. The words they exchange in the apartment aren't "friendly", but they're almost kind of bickering. Like they're getting on one another's nerves, but they both want to accomplish the same goal. Just in their own way. It does indeed communicate friendship.

Well, it looks like I have two scenes to play with today, haha.
I'll see what I can do about the landing at Coruscant scene, as per timdiggerm's comments. And I'll see what I can do about the elevator/apartment.