I know that floorstanding speakers always better than the bookshelf...I don't know what has made you think this but that is not necessarily true.
What you can expect is a fuller sound with the 804S as they have more bottom end to them.
Which to upgrade first, speakers or amp, would be your call; what is your current amp?