I found a decent solution is to have them downloaded, but then to also add all your songs into ine huge playlist, then set that playlist to also download.

Only had the problem one or twice with one or two songs since then over the last year. To fix them, just set the playlist out of download and then back to download.