Repeating in the middle of the measure

I'm notating a gavotte, in which each phrase begins with a half-measure pickup. The repeats in gavottes also generally happen in the middle of the measure. (See, for example, this excerpt from the Gavotte of Prokofiev's "Classical" Symphony:)

In my score, I want an end-start repeat barline in the middle of measure 10. I've tried two ways to achieve this. First, dragging the appropriate barline into the middle of the measure. This works visually, but the repeat is not honored during playback. Second, temporarily changing the time signature from 4/4 to 2/4 for two measures, dragging the repeat barline between the two 2/2 measures, and making the time signature changes invisible. This works both visually and aurally, but it messes with the measure numbering, so that measure 10 appears to be followed by measure 12 (which it is, sort of, but the whole point is to make the 4 beats surrounding the repeat sign appear to be a single measure, and this destroys the illusion).

Is there a way either to (1) make playback honor a repeat in the middle of a measure, or (2) fiddle with the measure numbering so that the extra 2/2 measure doesn't contribute to the cumulative measure count?