Yep, it was a total pain in @ss for me as well. It took me almost 2 weeks to figure out the difference in the locks and end pieces with the dealer. My local dealer is not what I would call a quality show. The good thing for me was, I had just purchased the bike and it was under warranty.
The con is, I couldn't find anywhere to order the arrow end pieces. Matter of fact, the dealer couldn't find them listed in the parts catalog after I showed them the pics of different end pieces. They had to call the mother ship and that even took 2 days to figure out the arrow pieces only come with the ADV model/bags and you can't order just those pieces.
Good Luck, let us know how you get it sorted.
13' KLR 650, 06' GL1800
"No good decision was ever made in a swivel chair" George S. Patton