I'd say the first one.
I just put on some AP-15 fans and I'm very happy with them. They dropped the temps about 2-3c and are much more quiet than the fans I had on before (S-Flex).
Now is also a good time to get some F3s: they are still pure Samsung and are pretty cheap on both Amazon & Newegg. Use Amazon if Newegg charges you tax (free shipping as well).
I like my AXP but it made my EVGA 480 into a 3-slotter. For me, SLI with two AXPs would be hard unless I moved to a bigger board. I just picked up some MSI 480s as they have the Frozrs and are only 2-slots a piece.
If nothing is too pressing, you can always sit on the cash. Bigger and better is always around the corner or you can pick up today's stuff cheaper later.
Good luck with your decision. Nice little problem to have.