If you have I-94 at departure, I don't see any reason you don't hand it in...
Anyway, I think a good strategy is to get everything ready at reentry and let the immirgration officer handle the rest. If you have any questions, you may clarify with him/her. It can't go wrong...