We just got back from Amsterdam a week ago today.
On our second day, we did the Van Gogh Museum in the morning and the Anne Frank House in the afternoon. That worked well for us as after the AF House you are mentally worn out. I would not have wanted to do the AF House in the morning and then try to have a "normal" day.
We did three day trips. We did Delft and Gouda, both on our own, and loved them both. The Delft factory/museum is a must IMO and was fascinating. We had dinner at Monastere in the main square in Delft and it was excellent! The third day trip we did, I do not recommend, at least not the way we did it. It is against the way we usually travel, but circumstances were such that we booked a tour. We went to Zaanse Schans, Volendam and Marken for a 5.5 hour day. It was way too rushed, and just overall, not good. I'll just leave it at that. If you decide to go to any of these, do it on your own.
In Amsterdam, I highly recommend Fulu Mandarin, The Pantry, Gartine's for high tea, and Restaurant 't Zwaantje. None of these are fancy by any means, but we had excellent meals at each. The Pantry was our favorite, although it is hard to compare as they are all very different from each other. You might be looking for higher end dining than these, but I thought I would share. BTW, we needed reservations at all of these. So many people were turned away at each place that thought they could wait for a table.
As for a canal boat tour, I highly recommend doing a private one. We had no planned on that, but our hotel, The Estherea, suggested one. This particular captain does either a private boat tour for 250 euro, or you can join in a group for up to 8 people for 55 euro per person. We opted for the group one, but happened to be the only ones that night, so had a private tour. It was 90 minutes long, and he had champagne, beer, etc as well as quite a few nibbles. The boat was beautiful! We booked with him through the hotel, but I found this link for him. https://www.trip.com/things-to-do/detail/37184867/
Edited to add, I just found his own website. https://amsterdamprivateboattour.com/tours/ click on book your cruise and you will see the two options.