I do what RubyRuby does. Sometimes I put the cards from the reading at random places in the pack and then shuffle several times.
I don't like putting the deck back in order. It seems to me that the deck should be shuffled continuously and not re-ordered. There are lots of other people, though, who do believe in re-ordering the deck. I think it's a matter of preference, but that there's no way it "should" be done.