I think your status is well maintained, so to say. You'll get the visa you need and deserve. Good that you are shooting at two birds with one stone. It is still mind-boggling for me to hear that to renew your status you need to get out of the country... and it is the US of A. This is a major joke I have ever heard against the USA's laws. Such an advanced country could have such an oversight! Good luck!