never taken the boat, wifey get sea/river sick easily. but the railjet is pretty nice.
www.oebb.at
mid-may weather should be nice to take the boat though. 3 days in budapest is more then enough, but i must say 3 days in vienna is only almost enough.
enjoy your trip