Yes, you should cancel the OPT extension upon approval of the H-1B so the last action ends on H-1B and not on the F-1. Good Luck.

Keshab