Devialet D1000 - done and done. Anbout as future proof as can be.
That being said, extensive first hand experience with Devialet and Gryphon suggest the Diablo would be a wrong choice either so long as you go with the Kallisto designed Gryphon DAC too! Shame they done have an ethernet or streamer option.
I just prefer the all in one wifi, streamer, DAC, amp etc. Two power cords, speaker cables and speakers done!