I thought I'd let people know what decision I made, in case someone runs into this situation in the future.
I decided to go with the Agilent 3000. I did it because I got a rather large student discount and I want this to be a long term scope. I don't want to have to buy a better one in a year or two when I am no longer a student. The arb gen, as Dave said, is rather a novelty since for only $750 usd, a person can get a Rigol dual output arb gen with better features. What put me over the edge was seeing the rather paltry waveform memory of the 2000 Agilent. Well, the fact that I accepted a job offer and that this is my graduation present to myself helps too, haha!
Now if you're reading this saying, "well I'm not a student, so what do I do?", I say go and buy a Rigol 4000 scope. The specs are similar to an Agilent 3000 (you can get into a memory / waveform fight but the Agilent is a good scope, period). If you want to keep your money with companies who push innovation, buy the Agilent 2000 and sell it in the future if you need a better scope. The Agilent will hold its value (probably better than a Rigol) and hopefully in the future, a better spec-ed scope will be cheaper.
Well that's my $0.02. Now I just need to wait... Grrrr, I want it now!