My brother had similar issues and rode in Shimanos as well. He recently went with a little larger size and in a Specialized shoe. He says he feet are now more comfortable in shoes than having them off!!! Not sure how to address your specific issue but thought I'd mention what he did.
__________________
Ride your Ride!!