I guess the things that keep coming up may be things that are unresolved, or at least the issues underlying them are, like trust, as you mentioned. Some of those things can be resolved, others just take time, and there's no fast forward button!
My only suggestion is to focus on "the now". How much of what happened before matters right now, in the moment you are in? It can be hard to move forward, when we are still thinking about wrongs from the past. If the issues have been resolved as much as they can, and you are both willing to give some trust, could you just make certain topics taboo?