'who's probably' isn't a very strong statement of enthusiasm.

Your best bet is for one of you to travel to the other and hack for a few weeks and sleep on the couch or floor if necessary.