Your H1b is still valid till its expiration date.

Yes, you have to sub-mit H1 I-94 upon departure. Your H1b still valid till its expiration date, the date that is shown on your approval notice. But your I-94 is valid for 1 yr.

Use I-94 to show you are AOS, use AP for travel and use H1b for working.