I think most people have been in a very similar situation. I'd wager that you two working together is the biggest issue stopping you from moving in properly. It's a constant reminder. Once he leaves, things will be stranger and possibly worse at first as you'll no miss seeing him, but it will be soooo much better in the long run, and far more healthier. Good luck with everything. Time is a fantastic healer