That looks better. I can't comment on the xmp fields, because the only images I have that are populated with them have been written by jAlbum itself, and those are consistent. The IPTC fields always seem to be Iptc.something, so at least that appears to be a safe bet.
But I'm puzzled about one thing. You've added a bunch of Iptc.IIM/something fields, which I've never seen in the wild. But it seems to pick up Iptc.Object Name, even though that specific field isn't listed in the selection box - there's only Iptc.IIM/Object Name.
Frankly, I still find that whole photo data selection method to be wildly over-complicated and fiddly, with too many confusing options, and inadequate control over the labels. Sorry. I hate saying "my own skins do it better," but I think they do. See Neptune examples, attached.
That's pretty much why I just let the user enter the fields - a quick look at the results of List metadata, and you know how things are stored in your images. The EXIF fields are standard and unchanging, but even there, I let the user supply whatever labels he wants.
But yes, doing a "variable conversion" routine on an existing project to go from one scheme to the other would be almost impossible. Just thinking about it makes me woozy.