Your understanding about the exact fit between your NIW job and a new job isn't correct. NIWs are not subject to the same portability requirements as PERM-based green card applications. That being said, when you are able to file your I-485 application, you might be asked to demonstrate how your work is serving a national interest, even if this interest is different from the one in the NIW.