Sounds to me like we have two ways to go with the nuke scene - both of which are a vast improvement over the original.
I think someone is already doing it in the way I prefer so I say we give your idea a shot. I think it could work.
Dialog with the FBI and Ross seems like it should work fine that way.