Toe overlap is nearly never a real problem. When you are riding at speed you only ever actually turn your wheel very slightly. Its when you are fannying about doing trackstands that you end up hitting your foot. Changing to a 650 wheel is gonna do no favours to comfort and handling. Just try riding it as is.
this