You get only a short time with The Last Supper (10-15 minutes if I remember correctly) but with the small group it is enough for a good look. And the monastery in itself is a beautiful and quiet place.
We did Waterloo with a group and a guide. If you’ re not an expert yourself I think a good guide is important. The Museum was recently updated and interesting. We arrived back at the bus at the very last minute.