Pete, I'm delighted that you got it taken care of and that Nikon saw fit to take care of the issues under warranty for you. I think you will be very pleased. I'll be interested in your impressions of the fixes after a month of use.
I continue to be pleased with the fixes on my camera. I took some family photos yesterday of folks I only get to see every 3-4 years and I was really proud of how they turned out. I've not needed to clean my sensor since it came back from Nikon with the oil spot issue fixed and that was about 500-600 frames ago. Still looks clean. My focus operation is outstanding and I'm happy that wasn't operator error, after all.
Please continue to update the thread with your experience. Have fun with your "new" camera.