Make spectator mode more like Dota where you can change the camera (only really want free cam) and no fog of war but there's a 2 minute delay to prevent ghosting. Then keep mentoring the same as it is now.

So people can actually "spectate" properly, while giving mentor more of it's own personal feel.