It is always more prudent to get everything right. On the practical side, I'm not sure how long you plan to stay in the States. Getting things changed on I-94 could be just a trip to the local INS office IF THEY HANDLE IT LOCALLY. In my experience, our local office stopped handling such cases a few years back and you'll need to send the original I-94 to the regional INS office (TX, NE, etc.) along with the form and the processing fees.