That looks like the correct solution. I tried to duplicate the solution at 45th and Lyndale. If you don't mind, could you take a look and let me know if I missed anything? 

Thanks for doing the research and coming up with a solution.