IANAL, but consider whether you can apply for transition to a B-1/2 visa today while your H-1B is still. They take 6 months to grant and allow valid stay while you're waiting. Talk to an immigration lawyer for details on whether this works for your case.