Visa annotations are not always accurate. Your situation seems a good mix of global issues. You are genuinely concerned about future and must seek advice. It would be nice to obtain advisory opinion from the DOS to make a knowledgeable choice.
13295 Illinois St ste 128
Carmel IN 46032
Ph: (317) 660-6174
What is your question?
I think that based on the facts as you present them above, you have nothing to fear, you will not be subject to the 2 year home residency requirement. Also, please do not ask for any "opinion" from a government agency, for they are completely unpredictable and if you get an erroneous decision (as I am afraid you might) you will then be stuck with it, with one officer protecting the error or his/her colleague and so on.
Good luck to you.
Behar Intl. Counsel 619.234.5962 Kindly be advised that the answer above is only general in nature cannot be construed as legal advice, given that not enough facts are known. It is your responsibility to retain a lawyer to analyze the facts specific to your particular situation in order to give you specific advice. Specific answers will require cognizance of all pertinent facts about your case. Any answers offered on Avvo are of a general nature only, and are not meant to create an attorney-client relationship.
You have to work with your DSO to correct the DS-2019.
This answer is of a general nature and should not be relied upon as final, nor is it intended as legal advice. Consult with a qualified attorney before making any legal decisions. Gen Kimura, (832) 247-6932.