why does he feel trapped? it has to be something other than the cleanliness issue he has.
my FI is a neat freak, but he accepts that i am not. yes, we get into arguments sometimes when i dont pick up after myself or clean something half-assed, but he would never say he felt trapped or couldnt live with me for the rest of his life because of that, KWIM?
so what are his other issues that are causing him to feel trapped? and are they the same as last time you considered leaving?