I use the Jellyfin for Kodi addon. It’s quite easy to set up and it sounds like you pretty much have everything you need already. Not sure if it could fix your issue but it works great for me.