We stayed at Boogaards B&B and just LOVED it. The owners were so helpful - such a personal touch compared to a hotel, plus, if you've never been to Amsterdam, you will need that ONE ON ONE experience. It is large, lots of bikes, trains, etc. Peeter will give you maps, directions, tell you the best way to get places. The airport is not in Amsterdam - wherever you stay, you will have to take the train into the OLD area of Amsterdam. Boogaards has an email address on his website and also thru TripAdvisor . . . feel free to email him with questions . . . he will get back with you very quickly re: walking distances to places. We walked to most places - canal tour, Anne Frank, shops, restaurants. We did take the train thru town to get to the museums - Peeter told us exactly how to use the train - we bought an on and off pass and used the train all day - the map is easy and they announce stops and have signs on the train about locations. Peeter's directions were perfect. Not sure what price range you are looking for, but TripAdvisor has never steered us wrong in Europe or here in the USA. Google Boogaards B&B - lots of good info on that webpage. Whatever place you choose to stay will be great I'm sure . . . we loved our 4 nights in Amsterdam.
We LOVED the Anne Frank House. The brochure they give you is so great . . . take the time to read each section as you go thru each room. It is an amazing, emotional experience. Buy your tickets online before you go.
Peeter will make you a HUGE, authentic Dutch breakfast everyday . . . so at lunch, we just grabbed a snack (amazing French Fries w/all types of yummy sauces) . . . we took Peter's recommendations for dinners (which were all perfect) . . . and then we had fresh, homemade Dutch treats/desserts made by Peter back at the B&B.
Another thing we did that you didn't mention was a GOUDA and wine tasting at one of the MANY cheese shops. I think we picked one off of TripAdvisor.