It's just that I'm more comfortable using "Infobox song", maybe you could port the "Music Video" section of AlbumSingle to it and it can be used as the primary template on the wiki? Having two is really confusing.
So you're fine with using "Infobox song" for songs? The only thing it's missing is the Audio and Music Video sections, maybe you can port those over, by copying the code from "AlbumSingle" and "AlbumSong"? I would do it myself, but I have absolutely no Idea how to.