Congrats, jds2013!! My timeline is very similar to yours, so I hope to be receiving good news soon! Seems like 40 days really is the magic number, as someone said.
You may turn in the I-94 upon coming in, but if you don't they'll just take it once you enter the country again. It's not a big deal.