Great trip. I did a very similar trip late june with another cruise line and thoroughly enjoyed it. Post river trip w also spent 4 days in Switzerland seeing Zermat, as well as Lucerne.
The castle section of the Rhine was a very enjoyable portion of the river trip.
Enjoy your trip