Torn between two... cameras

Been wanting to buy a DSLR ever since payday but still can't make a choice.. but at least i've already narrowed it down to 2 options.

Option A:

FS: Nikon D40 (CDSC unit)
- With Nikkor 18-55 II 3.5-5.6 Lens (D40 Kit lens, Non-VR)
- Complete, e.g. box, warranty card, cd softwares, accessories, everything.
- Warranty with CDSC-Megamall up to December 2008
- 16k actuations
- Very pristine condition.

Freebies:
- Nikon EN-EL9 extra battery (Nikon Original, bought Oct-2008 w/ receipt)
- Nikon ML-L3 wireless remote (Nikon Original, bought Aug-2008 )

Price: P18k Firm. Last Price already. No Trade/Swaps.
RFS: Upgrade.
Meetup Points: Makati, Rockwell; Malate, Harisson Plaza

Actual Pix of the D40 (but w/a diff Lens), for reference only:





Another option could be....

You can opt for my Nikkor 18-70 3.5-4.5 instead of the 18-55 II Kit Lens
Set Price for this Option will be P22k

Here is the pix of my Nikkor 18-70


or...

Option B

A Brand New Nikon D40 or 2nd hand D80

oh my....

which is which?!?! =(