Here's a bit more:

http://www.abqdog.com/

http://www.atomicmuseum.com/


For good food (not the best?) in a really nice environment (gives you the feel of the place
http://www.elpinto.com/

(the back side of the mountain. A great way to get to Santa fe, not much longer? lots to do?)
http://www.turquoisetrail.org/madrid.htm

as the time gets closer I'll know what's scheduled in town and around during that week...