Ditto advice from SoCal and masteff. This may not a "wash" as you imply, so do each step separately and completely.
As implied in Post #1, this situation will recur. If so, Andy correctly advises a plan termination, before the next RMD is due.
QDROphile is correct.
If the NQ plan does not have any existing language, it may be prudent to consider if there is any precedent.
At any rate, perhaps the plan sponsor should take this opportunity to amend the plan to incorporate some provisions for beneficiary identification. This might emulate the qualified plan, but is not required to do so.