MusicBrainz has separate concepts of "works", "recordings" and "releases" that I think should allow for some resolution of your problems. I'm not aware of any tooling that actually makes use of this level of data though -- anyone more familiar than me?