Looking for a DAP to replace Fiio Q3+Note10+ combo

I’m currently looking at the Fiio M11 pro and it seems to at least deliver what the Q3 can. I just want to avoid using a dac/amp in addition to a DAP. Also been eyeing the Hiby R5s. My main criteria are a 4.4mm output and something to at the minimum match my Fiio Q3IMG_20210307_083823|500x500