Subtitle for non-english audio streams only

I recently upgraded to Kodi 18. My issue is with playing the right subtitle, rather than downloading them. I used to have a Kodi add-on that could detect the audio stream and then if it was Japanese, then it would use the English subtitles. My ideal preference would be to use English subtitles on everything non-English audio and then forced subtitles or nothing on everything English.

I can't seem to find this add-on anymore, and the only functionality I can get working on Kodi using the default settings is the forced subtitles on English. Any idea what I can do?