What should I buy?

So I’m looking for my end game computer set up. I’ve currently got an Audioengine D1 DAC/Headphone amp and HD6 powered speakers. I find them to sound good for the most part, sure there are times where it’s a little muddy but nothing that I’m not entirely unsatisfied with. I also have a full home theater setup with SVS ultra towers and the full surround setup of SVS ultras. I also have used KEF Q350 with my system and they sounded great compared to the SVS ultras. I run that system with an emotiva amp and a marantz SR 7015. My headphones are currently Sennheiser HD650s but I’m considering upgrading eventually to the 820s

Budget is around $5k. Should I go passive or active?

If passive, I’m thinking:
DAC: Schiit GUNGNIR $1300
AMP: Schiit Vidar $700
HEADPHONE AMP: Schiit MJOLNIR $850
Speaker: ONE of the following choices, help me choose which sounds best on a desk.
KEF LS50 META
KEF R3
Buchardt S400
OR
If powered,
Same DAC.
Same Headphone amp.
KEF LS50 Wireless II
OR
Buchardt A500 w/NO DAC

I use an SVS sub in a 2.1 setup. Which route would sound better for a computer desk situation? I listen to music mostly but I also stream movies, typical use.