I'm suggesting we take an additional 40,000-60,000 refugees each year. As in people who are processed and found to be refugees. In terms of economic migration, such a number of refugees would be small compared to the large number of economic migrants we currently enjoy.
I don't agree with you that the people who have fled situations in Africa and the Middle East - as most of the Calais refugees have - are suitably described as "economic migrants" (although I have no doubt that there are some economic migrants among them, I do not believe they're remotely the majority) nor the many arriving across the Mediterranean.
As for claiming asylum in the first country they come to I see no reason that we should dent asylum seekers any agency in their destination nations nor do I think such a policy is sensible or fair. It would be absurd to leave struggling Greece to bare the entire burden of asylum seekers arriving across the med while rich Britain, France and German do nothing to help.
Yes, we need to build more homes to provide affordable housing to UK citizens. This does not mean we should not also take a strong role in helping refugees.