Work Permit to Tier 2, switching or new application

Hi,

I was a work permit holder which expired end of January 2011 and my contract with my old company ended at the same time. I have a job offer from my new employer just before my visa expired, and the company is processing SL application and getting a COS for me, since I am seriously short of time to apply for my tier 2 visa in UK, I decided to go back to my home country and wait for the COS. I've been waiting for 2 months, and still waiting... my question if I get my COS and going for the application for permission to enter the United Kingdom (entry clearance), should I apply as 'new application' or ' switching from WP to Tier 2'?

Please advise. Many thanks.

You can only switch from within the UK. And the visa application forms (for entry clearance) doesn't ask whether you are switching of extending!