You will never get 100% signal at your laptop because you have to take into account "Free Space Loss"
Calculator:-
Support :: Calculations :: Free Space Loss :: Terabeam Wireless
Input your Frequency 2400MHz
Distance between Antennas 0.001 Miles= 1.76 yards
Gives a path loss of 44.2 dB
If I assume the WRT54GS had a 2dB antenna before you changed it for a 7dB one and that the 802.11g output of the router was 13dBm
The output at the router should then be 13-2+7= 18dBm
The max signal arriving at your wireless laptop antenna will be 18-44.2=-26.2dBm
Your wireless card is not an accurate device at converting to power measurement and is probably dependent on how it's manufacturer does it's RSSI conversions. I get different results using different cards from the same location and different results using different scanners. You will also find that just turning the laptop around will give you a different result.
At this moment in time I get a reading of -36dB for my AP at 2 yards.