I have 2 802.11g routers.

Linksys WRT54G v2.2
  OpenWrt .9 White Russian
  Name: router1
  WAN IP (DHCP - connected to internet via cable modem)
  LAN IP 10.1.1.1
  SM 255.255.255.0
  GW 10.1.1.1

  ESSID: wnet
  chan 11
  Mode AP
  wireless mode b&g
  encryp: wpa(psk)
  WPA mode: WPA2
  WPA PSK: AES

Buffalo WHR-G54S
  OpenWrt .9 White Russian
  Name: router2
  desired IP 10.1.1.2

  ESSID: wnet
  chan 11
  Mode AP
  wireless mode b&g
  encryp: wpa(psk)
  WPA mode: WPA2
  WPA PSK: AES

router1 in my office connected to a few ip based pieces of equipment.  router2 is in the living room hooked up to my game consoles and htpc.  I would like to somehow have router1 & router2 wirelessly connect to each other and allow a bridge between them.  I would also like them to allow wireless devices to connect to either router and only grab a dhcp address from router1.  I am also curious to know if it is possible to turn the WAN port into an extra LAN port for me to plug another device into.

I have tried using WDS, Client, Client (bridge) and no success at all.  I feel like I am missing something simple but have been at this about 4 hours now.  I am unfortunately limited by my user level knowledge of linux.  Any help would be appreciated.