Welcome to the forum @bangsy.
Unfortunately there’s been no development or announcement, but have a read through here and here as places you may wish to make your voice heard.
Regarding spending weeks organising, I’ve often thought I’d do the same thing; but what happens if/when the genre editor materialises? Wasted time? Are there whole new genre mappings that come out? I’ve decided to wait and wait and wait. Do let me know if you plunge in, and how long your library took!