That's my setup too and it has worked so well that I sometimes feel like I have to double check that it's still working because it runs so smoothly.

Occasionally I have to consolidate multiple edits with ediff-files, but that's normally only after I have accidentally disabled wifi on the phone for longer periods of time.