Pasante Regular and Naturelle are shaped (see their website:
http://www.pasante.com/choosing.html), so should already have that covered.
Get yourself some lubricant (they have some on the website - try asking at the FP clinic) and you should find it all works a bit better.