50mm AF-S 1.4D or G?

I'm about to add a 2nd lens and this will be a prime. I have a D40 and I'm pretty happy with it still. I need to expand on the lens collection before upgrading the body.

So the question is will you buy the G version of this lens? Or should I just wait until I have a new body and then get the 1.4D?

I've some comments from owners of both saying the 1.4G can hold its own and its worth the extra money. Anyone other owners of both lenses agree with this?