You are right in just adding the two moments of inertia, that is the same as adding their angular momentum together, which you can do: if you imagine the particle was there without the disk, it would have L=mR2w, and the disk would have L=1/2 MR2w, and then to get the total you could just add...