I still get the sense that you're covering your vocals with effects and harmonies to hide the main vocal. I still think you're searching for your voice, and I think you're singing the way you're singing because you think that's how singing is done. I have a friend who, whenever he sings I think "Why are you singing like that in that strange 'affected' way?" I get the same sense here.
Now there's nothing wrong with vocal affectation - just ask Tom Petty - but there's good and bad. I think at this stage you're singing things which are too complex melodically for your current stage of vocal development and if I were you I'd strip it back, keep lower in my range, and keep it simpler.
I hate cover versions generally, but I'd really like to hear you record something simple and standard that I know, so I can hear how you'd sing it when you have something to copy stylistically. I'd bet it sounds way different from what you're doing with your own tunes.
The rest of it sounds great, as everyone else is saying, but the vocals are still the weak link and I feel like I shouldn't keep harping on it because I'm not exactly a vocal coach or singer myself, but you did ask! My other suggestion is to give the track and the lyrics to someone around here who's more accomplished vocally, see what they do with it, see if you can get pointers from that.
All that said, you're definitely moving forward - and I hate to keep grinding you about your voice.
Few timing issues around "Amarillo"... drums.