I would not flat out recommend equipment that has major flaws for the type of work expected.
Although the CaNikon cameras are decent machines for general photography, they can be a PITA for closeup work when you come down to models, mainly because you cannot check sharpness critically. Essential accessories also come expensive. Tilt lenses for sharpness control are expensive, and to use them, you need live view with magnification, which is not available on all cameras. It also helps to have a swing/tilt screen for ease of work.
IMHO, the best camera for this kind of work presently might be a Panasonic m4/3 camera, for example G3. There is a decent 7-14 mm lens for normal architecture shots, and with a tilt adapter from Peleng, it accepts any M42 SLR lens, the best of which come from Fuji and Pentax. A good companion for the adapter would be a 24 mm manual lens with multicoating, but they are a bit hard to find, and a 28 mm might be easier to get.
When shooting in-camera jpeg or converting with the bundled software, optical deficiencies of original lenses, as distortion and colour fringing, are controlled automagically. The video is more than decent, and critical sharpness may be checked in the viewfinder, a feature that no Canon or Nikon has.
So that's my suggestion, a tool that is more apt for the kind of work to be done.