I don't know much about publishing markets, but I think I'd worry about re-shaping and re-writing the story until it's closer to what you're looking for before looking for genres.

Alternatively, look for specific markets for it now, and take that into consideration as you re-write? (Depending on whether you feel you'll be finished with this in time to make their submission deadlines, etc.)