You'll be fine. Just get a new I-20 from your school and you're all set! But don't travel when your H1 is being processed and since you already applied for an OPT extension, I'd also suggest you to wait until the extension is granted.