I like the idea that purple angel mentioned of getting the E11 and possibly the E10 for the laptop. You will get more power out of your portable rig and have more power at your desk. This could be desireable if you ever end up with 250 or 300 ohm headphones. If you don't mind spending a few extra dollars you can order the Fire Phoenix from china which has rave reviews for $110 dollars but lets not get ahead of ourselves. You can start with the E11.
If you want to save a few bucks on the LOD cable (Line Out Dock cable) then order this one:
This is what purple is talking about to bypass the amp in the ipod and use the E11's amp instead. Much much nicer.
E11+L3cable +charger+battery = 75 bucks.
(note on link that the E11 comes with the "accessory package" wich includes the extra batt and charger. The E11 also acts as a charger itself when plugged into a standard USB).