I use a Synology NAS at home. So I won't be waiting for either of those options. I'd love to see a dedicated app compatible with my synology. I retired my apple tv because I got tired relying on airplay to stream my videos to my apple tv. I bought a roku box because synology released a dedicated app for it. Much easier for my wife and little kids to use it.
I'd jump right back to my apple tv if a synology app pops up for it in the future, or any dlna streaming app for that matter.