@hifi_jed_1986 I am partial (as I have one for sale), but e.g. the Innuos Zen Mk3 server/streamer is an excellent choice for what you seem to be looking for, both A8 upgrade- and functionality-wise, w/o breaking the bank.
It can have up to 4 Tb of storage (mine has 2 Tb), Innuous’ Sense software is known for how good it is, and the Zen is fully Tidal and Qobuz Connect compatible.
It also has a built-in CD reader so it’s also easy to rip CDs with a minimum of fuss and work.