my answers
1. should not be a problem (because I do not think this is what the immigration officers focus on. Besides, they know the immigration law (of sending petition to NSC only) only changed for a few months.
2. if I could wait for the offer letter. I would file my petition after that...
Just my two cents