Dont think you will not be able to get visa on arrival to Doha. you current Qatar visa will pop up at the emigration screens on entering your details. they cannot issue a visa when you are already a resident.

get this cancelled and get an NOC from your earlier employer to enter.