I voted for option 2. I like the idea of having a short and a long category. It always seemed strange to me that those runners who excel at short fell races (which are akin to a 10k race), or those that excel at long fell races (which are more like a marathon) can't be champions at that distance.