Yes, it is possible for 505 owners to get a discount on the 630. It took me a lot of back and forth with them by email and phone, complaining about how their screwy HDCP firmware essentially broke my perfectly good receiver, and how I would have went with Bell if Shaw Direct's receivers had that limitation from the start.
I got $200 off, but have to pay the HST on the full amount. So $250ish to a credit card, and the $14 shipping on my bill. And I keep the 505.
They did admit that there is no firmware fix for the 505s and there never will be, and so far the 630 is their only receiver that doesn't have the HDCP issue.
I did start this as a new topic, since this one's 99% about 530>630 upgrades. But it was deleted. Apparently we're fans of 50 page topics with extremely wide subject matter around here.