Here's my setup if it helps.

I also had to have all of the wireless stuff in APClient Mode (which I know you said worked ok)..

The downstairs wireless router needed to have the other MAC address entered in the configuration screen though.

I don't have a default gateway set on the downstairs WAP either - that might be your problem.

Paul.