Technically you are in both arenas, more so in piecing. I don't classify you being totally in piecing until that man is back under your roof.
I may be very wrong in what I'm thinking, but he's testing you because he's getting close to coming home. It could have been his way of seeing if he really wanted to come home or use some excuse to stay put. It's all part of the exiting of the crisis.
You are going to need more than duct tape. You are going to have to dig deeper than you ever have for more patience and compassion because once he's home and under your roof, the true testing will begin and believe me, you will not be able to hold your tongue or your patience for very long if he continues w/comments, etc. You will need to count to ten, walk away or change the subject. Another thing, you will need to learn to smile until your face hurts at times. It's a very trying time, one that is almost as bad as dealing w/a child who has colic.
I wish you all of the best.
Sit quietly, the answers will reveal themselves when you least expect them to. The past is gone, the present is a gift and you need to focus on today, allow the future to reveal itself when it is ready.