It looks like the issue has been addressed and you've got a solid plan now ~ but it might be worth saying that I agree with Waltz en France that it shows more character development if there's friction in the beginning. One of my pet peeves as a reader is when people get along a little too well.

Also, your project sounds amazing!