Go for the 400D since you have already gears compatible with it...
but for its price the nikon D40/D40x really made damage to the entry level DSLR....

get the feel for the cam.. i did... when i was at hidalgo dalawang cam din pinagpipilian ko...i choose what's comfortable and what's easy to use... even for my wife...