I’ve been doing just as you suggest. I miss the auto-fact-creation, but it’s the best way. I’ve also been using FTM 2017 to change out many of the unintentionally unique facts. And it’s taking a long time....
Also, I’ve noticed that the article picture that gets attached to the Citation is very low quality. So I’ve been downloading the PDF version of the article and attaching it to the Citation.