This is one of the more unusual flowers I've found in the Sierra, but I am having a hard time ID'ing it. Looks like a Jewelflower, from what I've found online, but the top "antennae" look different from this plant.
Think you are right on your ID. Check the link below to a listing of the plants found in the Sierra Nevadas.
Here is a link that might be useful: List