Help finding the name of a stretcher-bearer and athlete

Hello!

Search engines haven't been much use, so I thought I'd ask here.

I remember being taught the story of a heroic stretcher bearer (or perhaps combat medic) in school; a kind of Desmond Doss type figure who saved men under fire. Here's what I recall:

- the soldier was Scottish

- he either was, or became, a sprinter (perhaps in the Olympics)

- he was actively religious (a Christian)

- he may have refused to carry a weapon

- he carried men to safety on his stretcher

- he survived the war

These are all memories from 15+ years ago, so I may have some details wrong. I am certain of his "hero" status, his athletic career, that he saved men with his stretcher and not through combat, and that he was religious (these were all core parts of the lesson). I am also fairly certain he was Scottish, as this was at a Scottish school and we had a "national heroes" angle in a lot of lessons about specific people. I'm also fairly certain he survived the war and had an athletic career afterwards.

I'm certain I'm not mixing him up with Desmond Doss (the WW2 hero), as I learned his story for the first time years later and it reminded me of this lesson

From my attempts at trying to track down this name, I am ruling out William Coltman (English, not a runner) and Noel Chavasse (English, did not survive the war).

It certainly could be the case that I am mixing up some details and Chavasse is indeed the man I'm thinking of, but I'd be keen to know if there's someone who better fits my recollection.

Thank you!