I recently saw a nice solution: a small chevron shaped metal flashing a foot or so above the skylight. Thus the bulk of the water streaming down the roof would be diverted left or right before reaching the skylight itself.
It sort of divides the job… and reduces the splashing potential at the skylight flashing itself. Obviously this would only work on a sloped roof with a lot of roof above the skylight.