Scoring two sections on one page for a short chorale and fugue?

I'm writing out some new instrument parts for an existing chorale and fugue. I'd like to have the measure numbers start over at the beginning of the fugue section, and also show subtitles for the chorale and fugue sections at the start of each. Has anyone encountered this?

Many thanks!