You've been a busy chappy, Happy.  And most succesfully.  I was advised not to worry too much about track placement,  Just go with your best guess about genre and keep delivering lovely tracks like this.  People will, or at least should be able to forgive filing errors, concentrating more on the quality of the music.