I’ve migrated from using an Kodi player alongside my Apple TV to retting rid of Kodi and using Infuse to play all of the media on my file server. It’s pretty easy to get started and does everything I need, with the advantage of just using the one device.