Okay, got the fretboard fixed to the neck. I had a gluing crisis the first time around (the fretboard slipped a little as I was clamping it), and the glue had started to set, so I pulled it back off, removed all the glue, and tried again. Perfect this time.
Now to get a nice transition from the fretboard to the headstock, and shape the fretboard body overhang, then neck shaping. This is the first neck I've made, and it's been easier than I had imagined.