Dogs now fine...fingers (& paws) crossed...

Without speaking too soon, I think the dogs are now OK. They've are now together all the time and they are now only separated when they are eating. Its still a little bit tense (from our point of view) when they start play-fighting but generally speaking, they're OK. Long may it last!