Dilemma

My Fuji S100 have died. Now I doubt between D3100 with 18-105 and D90 with the same lens.

I photograph generally in manual mode or if it must go rapidly in p mode. Photograph especially buildings (both within and outside), grand-daughter, from time to time close up, landscapes, sun-down.

Intend buying later 70-300 and 35, 1.8.

D90 more is 3 years old , but 3100 a newer technology is. The 3100 combo is cheaper.

Any suggestions?

In advance thanks