Don't drop $300-400 on new audio equipment when you are using 558's, which aren't very demanding and no offense; half-ass Logitech speakers. Get new headphones first.
Get a pair of DT990's or 770's if you want closed, AKG 701, or ATH-AD700x. Try your new headphones on your on-board if you then feel you need something more to power them then get a O2/ODAC combo, and FiiO E10, or if it were up to me a TubeMagic D1 Plus.
Here are some links to some of the headphones
DT990: http://www.amazon.com/beyerdynamic-990-Premium-250-Ohm/dp/B00193FT26
DT770: http://www.amazon.com/Beyerdynamic-770-PRO-250-ohms/dp/B0006NL5SM/ref=sr_1_1?s=electronics&ie=UTF8&qid=1380605042&sr=1-1&keywords=DT770
AKG 701: http://www.amazon.com/AKG-K-701-Headphones-White/dp/B000EBBJ6Y/ref=sr_1_1?s=electronics&ie=UTF8&qid=1380605059&sr=1-1&keywords=AKG+701
AD700x: http://www.amazon.com/Audio-Technica-ATH-AD700X-Audiophile-Open-Air-Headphones/dp/B009S332TQ