Song with repeat and partial

[Raphael Mankin]

This is a follow-up from a question I asked a few weeks back.

I have a song with an intro, several stanzas, and a refrain. Each stanza starts on the last beat of the measure.See the attached MWE.

Is there a neat way of avoiding having a repeat bar in the middle of a measure while preserving the stanza numbers is their proper  places?

MWE.ly
Description: Text Data

MWE.pdf
Description: Adobe PDF document