Yes SV, you're correct about the Air Line Diner being in GOODFELLAS, as well. The final Queens Diner depicted in the movie, is the Sherwood Diner, which was used for the final scene between Jimmy and Henry, when Jimmy asks him to go to Florida and take care of that "rat." It's located on Rockaway Turnpike on the Lawrence/Queens border. As you head into Lawrence, it's on the right.

Boy, mob guys and their diners!