7.0 requires Peer ID for multiple dialup IPSEC sessions

Prior to upgrading to 7.0.10 I was able to establish multiple Windows Native IPSEC dial sessions to the same Fortigate.  Now I can only have one active at a time.  I'm fairly certain this is due to the requirement to have unique Peer IDs for each session now.  My problem is that Windows native VPN doesn't support Peer ID.  It appears that only the Fortinet VPN Client supports this.  I've tried using the Fortinet VPN client but find it difficult to get the settings to jive and work. (having to create new tunnel endpoints, convert to custom and play with Phase1 and Phase2 settings)
Any advise on how to solve this?  Any recommendations on Fortinet VPN Client settings or another VPN client or hack for Windows native to make it work?