Add an ability that allows you to roll twice and select the effect for your whims, increasing the amount of rerolls until you get to choose the specific whim you want, around 18-19. If you do that, change the help focus.

And maybe type changes to outsider with chaos subtype at 20?