Ohhhh sounds amazing Travelbug!
Last year I did a Trafalgar tour and whilst it was a bus tour and not a river cruise, we did spend some time on the Rheine river in Germany - it was magnificent. We also visited Cologne in Germany which was great.
If you're going all the way to Budapest...