... Fujifilm Finepix X20 and a Mac Mini.
I seriously considered these options in the last few weeks ...
Naim UnitiQute 2 + ATV3.
Creek Evolution 50a + Ruby DAC / FM module + ATV3.
Fujifilm Finepix X100s.
So another year with the Marantz M-CR603 which is fine. (Quite a relief actually, as I really don't want to part with the Marantz any time soon.)