For an upgrade i would reccomend the 3100 or the 1600 af, if you can get the 3300x for a good deal (20$ over msrp of 3100) then get that instead, i would bet that the 1600 af is problably wayy overpriced anyways so if you can get that for a good deal then choose that over the 31 and 3300x