You are on the right track. You might consider adding cables from Jenna Labs and speakers from Zingali. I can assure you that you will hear music as you never thought possible.
Good Luck with your search, & Good Listening,
Good Luck with your search, & Good Listening,