CPN Restriction should not matter...
Make some of the changes I mentioned, then look at the invite... when you get a combination that shows the FROM field as the caller and the P-Asserted-Identity field is your main/billing number, you have the right combination and it's up to your carrier to pass that through.