Personally I would go with a fay as a explanation of what Spirit is rather than a Imp, it would make the shapeshifting and whole magical aspect make more a bit more sense.