As far as running order goes (and I think it's a very important factor), I would pick the first version... yes, without "Silver Springs". Unfortunately, it wasn't part of the original album and it should have been a "bonus track" in the next releases... jmho.
But because of audio issues, the 2004 edition is the best of the bunch.
Song of the moment - Rhiannon