I've upgraded to the 822 and 2 DBU beltpack sets. I decided to fully commit and could not be happier. I've had many environments in the last few years trying to get a clean signal due to RF, and those same venues with the digital units are not a problem at all. The quick scan and set with the IR setup has really cut down on my setup time and the sound quality is way beyond my expectations. In fact so good, I might finally go wireless on my booms.
Sorry I don't have any experience mixing the hybrid with this system, but the method you are going with swapping out to digital as you can should work good if the hybrid units maintain some value. Again I don't know how steep they will loose value with COVID and the lack of chips making the 822 units still rather hard to find so I think you have time in the near future.