I see absolutely no reason to change the crank.
A 34/36 is so close to a 34/34 for a bailout gear you might as well stay with the slightly lower (6%) ratio.
Are you really SPINNING OUT a 46/11? if you aren't for more than a few seconds at a time, a 48T is a step in the wrong direction.