There are riffs and vocals that define really good songs.
You have the making of a really good song.
Ultimately, vocals don’t matter as long as they are honest, consistent and don’t sound like you are trying too hard. Less than par vocals however, IMHO, need to be married to the music more. Or washed out by the music.
Or Autotuned into acceptability. *grimace*
I agree with the principles you described. Ultimately, IMO, a song can be anything...except boring.