Mark,
1. Are you having the two gateways (Client <-> Main) form a tunnel?
e.g. You login to the Client GW box and run pptp client to
the Main GW's pptp server.
Then your assumption are correct and is a different scenario and should work. There is a How-To somewhere on these boards. Try the Dev one as well to double check..
2. If you are doing #1 above, it'll be better/easier if you used IPSec tunnels.
Ed