Since you are already using EAD to work, you are in AOS, not H-1B status. So you cannot legally enter US with your Canadian passport and I-797 for H-1B.
Second, you cannot enter with Visa-waiver because that will invalidate your I-485.
30-day visa automatic revalidation policy doesn't apply either, because you are no longer in H-1B.
So better wait until you receive your AP before traveling abroad.