Plenty beefy. I'd upgrade the CPU if it's cheap/free. Also depends on if you intend to do things like add jails/Plex transcoding/etc. or do very heavy SMB use (as Samba is single-threaded). Unless you have a heavy duty use case, either is really overkill.