Looks like you're on the right track as what you wrote here is a good plan. Dealing with these things is a process, takes time, but you have already figured it out, so congratulations.

Those rolls look fantastic. Do you have a recipe for them? I would appreciate it :)