Sounds very much like the shifter switch based on the above. Having a look at some shifters on eBay it looks as though the shifter moves a cable - so the actual switch is probably not in the shifter itself. Could be the cable is slightly stretched so in 'D' position it's not quite aligned properly - might be possible to adjust the cable tension?