Not a direct answer, but here is my approach:
Given how complicated dual taxes are, and the high penalties involved for minor things (like forgetting to fill out an FBAR) I am having an accounting firm do my taxes this year. I do expect this will be costly. I did my US taxes myself for many years, even with moves / home sales / investing / partnerships. I used HR Block. What I plan to do is "shadow" the accounting firm's work on my own with HR Block again. I won't file this, but I want to see what I am missing, and what the software can and can't do.
It's an experiment; I view it as a learning exercise. I will see at the end of the process if I am confident to continue on my own, or not.