The other one,
Actually, your case is very similar to my husband's case: I'm preparing his complaint and his GC is based on our marriage (I'm a naturalized citizen myself).
About a month ago we held a discussion on this forum whether it is better to file 1447 alone or 1447 together with WOM. After seeing cases remanded to CIS with no timelimit to FBI (Like Riz's case was), I decided to combine 1447 and WOM, because we need the court to compel FBI to complete the name check. I still haven't filed, but am getting almost ready.
I can't tell if it makes much difference and saw many cases where 1447 alone were as effective. It all may depend on a judge you get. If S/he is nice, you get meaningful order anyway, and if not, your WOM would not help either. But I just thought it is more logical, as FBI seems no slip from any time constraints, so we need to add APA and Mandamus for them and CIS is covered by your 1447 complaint.
It's just my gut feeling so I'm going to do it this way, and I think some other members also combined 1447+WOM. Perhaps they may comment on their experience.
BTW, what district are you in?
Good luck!