Aha! I figured it out... some of those rock puzzles did a number on me, but I beat it! Does it make me a bad person that I very quickly figured out how to beat the final battle :P
Were you able to get the princess out of the crystal without collecting the 5 shards?