I currently have an Emotiva Rsp-1 to a Behringer Ep1500 to  boston CR 67's with   my main source as my laptop.  At this point, and the forseeable future, I'm using this for only stereo music with a turntable and my laptop as a digital source.  I realize that this is an entry level system, but it seems ridiculous to be driving 300$/pr speakers with 700$ worth of processing/amplification.  So my question is should I upgrade my speakers or the source material first?  
As of now I'm considering the squuezebox or duet ( both of which have a very good DAC to match with the Emotiva), or a handful of bookshelf speakers including System Audio SA705, Ascend Sierra 1 and Polk Lsi9.  
The other viable option for digital enhancement looks like an external sound card combined with a computer remote.  As a note, I am relatively happy with the sound now, so my budget is flexible for either one, starting at about 650$.
Any opinions?