Streamer/DAC+integrated vs All in one?

Fairly new to the hifi game and finding this community an amazing resource! I’m looking to step up my 2 channel music system (denon 3700 not cutting it). I’m running Martin Logan Motion 40 speakers for now. HT bypass is essential. I stream tidal/Spotify 90% of the time but have a small but growing vinyl collection on a fluance turntable with ortofan blue. 
I’ve been testing a Marantz Model 30 with a Marantz NA6006 network player. The sound is nice and a huge improvement over the denon. I like the soundstage, detail, and silky sound. The streamer to the model 30 is clunky though and the Heos app sucks.  I feel that using the streamer for volume control isn’t ideal. The Marantz is having a circuit protection issue so it’s going back and I’m thinking I want to bump up the budget. 
Gold Note IS-1000 or a Lumin D2+Luxman L550axii are top of the list. I’m very tempted by the convenience of the one box solution, mostly for being able to run everything streaming from my iPhone including volume. But, the rave reviews on the Luxman sound are intriguing. Curious to hear thoughts from folks who have heard them both or compared similar all in one solutions to a more classic well built setup. 
Thanks!

Trent