I like this Scotty episode better than the Spock one. A stronger, simpler story. One question I have is, what's become of McCoy by then? It's not likely that Data would have forgotten the association, so it may be that McCoy dies between Farpoint and S5 TNG. He was depicted as extremely frail so it may well be.
I agree it was necessary for Geordi and the others to be a bit insensitive, and Scotty a bit stubborn, which of course was no stretch - for the story to work.