my suggestion is
以不变应万变。there is no shortcut in terms of VISA in US, a very daunting processing. keep your life simple. You are gonna leave US anyway. why bother? I would keep current H1 if I were you. the rest, I believe, is much easier to get handled than status. just my personal opinion.