I think it is a good idea to step back for awhile. Staying in his apartment is definitely a trigger for you right now. Can you stay somewhere else for some time?
M:50 H:52 S28 (my S from previous marriage) M:17 + 3 BD: 06/12 S: 06/12 - H works in another state