Street view shows that it's been like that since forever, so I'm not sure why TM has it differently. The RIS Viewer and Traffic Data Viewer have a third way (up Church and Grant), but it's largely not supported by signage.
What a mess. Following signage is probably the best way here.