Camzor, Yes, I think you made a decent decision. Direct from Apple isn't bad, but you have to wait so long to even see if it is going to have any issues.
I had the i7 from Apple on Thursday, immediately had to return it, which took in total 1+ hour on the phone bouncing between agents.
I ordered from Amazon and have the i5 now. The yellow is *much* better. It is almost unnoticeable, so I may keep this one.
However, if you do have trouble, Amazon is very good.
They will re-ship you another (if in stock) via quick service and charge you $0.00 as long as they get the other one back within a couple weeks. Sometimes on the large item they might make you pay the return ship by taking it to a courier, but if it is a defective they'll refund you extra when they get it back to make up for more or all of it. Or sometimes they can send out UPS to get it, but they do that less now.
Of course, if you just want a refund, they'll do that too. However, 30 days is a fairly strict limit, so you should decide early on, if it is right or not.
Hope you get a good one! It is a great computer.