Advice on wireless system

A new child requires that I transition my modest audiophile system to a more usable and available version.

My new system will be a home server with my digital music, combined with a remote system.

Here's my question:Would you recommend that I buy wifi speakers with an embedded amp (Eg Audio Engine), or just use my existing system, and get some sort of wifi link that connects the server/router to a wifi receiver that serves as a source for my preamp?

If the second, any specific hardware recommendations would be very welcome.

Thanks in advance,
Charles