To me, the music is always more important that lyric context, so I have to go with Gilmore, especially considering his solo albums...
If you're saying the music is most important, than that is not necessarily a reason to favor Waters. People keep acting like Waters' only contribution was lyrics.
He was the primary songwriter which includes creative conception of the chord progression, rhythm, vocal melodies, musical riffs, etc. as well as the great lyrics.