In case you're still interested, Mayhew Labs made an 'in between shield' which can be used to re-map the pin connections between shields to resolve conflicts like this. It isn't cheap and adds another layer to the stack, but does make it possible to work around pin conflicts when you want to use standard shields.