If it were me and the difference was $1600 then I would definetely replace with a new kitchen. With replacing you should be able to also start claiming depreciation on it over a certain number of years.
I would also not pay the extra for Granite as there wouldnt be much difference in rent...