Automatic Revalidation is based on your I-94, which was issued based on your AP. If you prefer to be in H-1, go apply a visa.