I’ve owned the Bifrost 2 and heard the Matrix XSP. They are capable DACs that seem to line up well with the caliber and price point of the rest of your system.
After the CSP3 arrives, perhaps see how things sound with your Eikon and DACs that you own at that time, and then assess what direction you want to head sonically. After getting my ears on the Bifrost 2, Gumby, Yggy, and Matrix XSP, I preferred the Chord Qutest (not ladder; FPGA) with my gear and for my sonic preferences.
Flavor and performance differences aren’t monumental (Edit: I found a fairly significant performance margin between Bifrost 2/Gumby on one hand and Qutest/Yggy/Matrix XSP on the other), but noticeable and can accumulate. I’d probably focus on the headphone and amp before moving on from the Matrix.
Check out a potential solution.