My 18th century Mexican ancestors always seem have slightly different baptism, marriage and burial names, particularly when they had four or five given names, and I sometimes struggle on deciding where to insert the extra name that appears on a record.
So in this case, I agree with your naming convention.