in three years I highly doubt those parts you will upgrade will be beasty, you know how fast technology advances,
in my opinion, I would go with the amd, and if you plan on upgrding in three years you will probably throw out the old one and build a new one and call it a upgrade