Since you already have the NOC, another option would be to cancel your RP, exit Qatar and return on new work visa with appropriate position.