One of my friend has similar situation and he called CIC regarding this as my friend has 2 different NOC's but under same category. So CIC guys mentioned that as long as your work experience is under same category ( either O A and so on), you can claim points for that.