To my knowledge, you cannot enter Qatar without an NOC or wait for 2 years. Regarding the "Q" companies, its better for you to clarify this matter directly with them before you leave Qatar.