Hi Sarah - It's hard to find brioche, even at a bakery! You could make your own (if you do bread), but I always just substitute challah, like you suggested.
Now, I have to go find that recipe!!