I hope that you are starting to feel better! It seems as though your decision to stay in the house was a great one. There are some things that you have to go with your gut on and this was one good choice.
I also believe that the trip coming up is only going to help your situation even more. It always seems that when on vacation people are more relaxed and able to just enjoy themselves better. I hope this is true for you too.
Of course Poland is going to be a raw wound but think of it this way, if things had continued the way they were (you did say you guys argued alot before this??) and you had not taken that 'break' to Poland you might not be making all of these wonderful travel plans right now.