Considering that no-one in world history ever beat Nadal at RG and then went on to win the tournament, does that mean that every RG win since the beginning of time should be asterisked?
That would leave Nadal at:
Slams: 4 legit + 7* (RG as per your specs)
MS: 17 legit + 4* (MC since it's become optionnal)
Not too shabby still, but I guess that would make him drop from tier 2 to tier 4 (ie behind Djokovic at this stage).