Rex,
I remember I saw somewhere pictures of your XM9 from the Camillus Cutlery, and I was finally able to find the topic
http://www.quarterbore.net/forums/showthread.php?t=1564
To give you my personal opinion I would follow Fred's suggestion about the pommell.
Chances to find an original machined M7 pommell are extremely scarce, and I believe that $1000+ (as the current auction price) for just a pommell and a scabbard is way too much.
P.S. Looking back at the pictures of your blade, I'm wondering why they installed the crossguard in the wrong way....