Match v1 quirk entities before v2 (#391)

Discover v2 entities after v1 entities

Author: puddly

zha/application/discovery.py

@@ -257,15 +257,15 @@ def discover_device_entities(self, device: Device) -> Iterator[BaseEntity]:
 
         assert not device.is_active_coordinator
 
-        yield from self.discover_quirks_v2_entities(device)
-
         for ep_id, endpoint in device.endpoints.items():
             if ep_id != 0:
                 yield from ENDPOINT_PROBE.discover_entities(
                     endpoint,
                     device.gateway.config.config.device_overrides,
                 )
 
+        yield from self.discover_quirks_v2_entities(device)
+
     def discover_quirks_v2_entities(self, device: Device) -> Iterator[PlatformEntity]:
         """Discover entities for a ZHA device exposed by quirks v2."""
         _LOGGER.debug(