I think your problem is the Focals. In the UK they are known to have a very bright signature sound. When Focal and Naim combined it was unfortunately not a good marriage from a Hi-Fi view - Naim has a very forward presentation and mixed with the Focal it makes for uncomfortable listening for many. If the Gryphon has this very detailed Naim sound then the amp-speaker combo you have will be the cause of the harsh top end.
I’ve had these issues before, harsh sounding systems, and I really think that changing the DAC will not really help, and changing the streamer less so.