What is a good VPN appliance & client

Hello,

we are currenly using a Linksys router (BEFVP41). I have an IPSec tunnel setup on the router for VPN connection. I am using SSH Sentinel 1.3.2 (last version that was free, as far as I know). My client PC is also behind a Linksys router (WRT54G) a none VPN router. My problem is my VPN connection will drop many many times a day. A lot while I am right in the middle of something.

I looked at going to Microsofts L2PT / IPSec, however, I could not get it to work from behind my router on the client side. If my client PC was hooked up directly to the cable modem, not a router, it will work.

My question is, what is a good matchup for a VPN Server and Client? Seems that IPSec is the trend these days, however, PPTP seems to be more stable.

Any suggestions, comments?

Thanks