A boattrip at night is quite nice, don't go during day as it's nicer at night.It seems you pretty much summed up the things/places I did/visited When I remember some places I'll add them