Thanks CrazyOne. Haven't been to either. I'd also thought of the Phillips Collection but your choices may be better as they are walkable from the hotel in the morning before a late check-out. I'll pick one.
This is going to be some trip. We leave in a week.