@Da***
, I wouldn't even consider leaving this country thinking you're going anywhere to get a Non-B visa and then get back because you'll be out of the country for a GOOD long time applying to get back in and meeting the requirements to get permission to re-enter..
Sit tight, stay on your extension now, OR have your employer go to the immigration office with you and see if you can cancel the ED visa extension you have now with a letter from your school and immediately apply for a new extension based on employment with documents from your employer.