Please don't make the mistake of buying a computer for digital audio. Given the system you have, your post is confusing but if you are budget constrained I recommend the following
Android or iPad wireless tablet using Kinsky or Oppo Media control app
Oppo 103 as streamer/DAC
Synology NAS for media server
This will set you back all of $1200 with best flexibility for future upgrade and a solution with 24x7 stability. All you need a PC/laptop for is to transfer ripped/new music to the media server.