If i had to buy now, I would get AMDŽ Phenom™II X6-1055T plus AM3+ motherboards. It supports the AMD Bulldozer upgrade.
My mistake, the AM3+ Motherboards are still not released. Back to the drawing board.
Anyway with only the 2 option for upgrade you choose, I would get the 6 core.