Yes, I think you're right. Then no 1 if it's still too low. (My meter really is ancient, spiders crawling out of it, etc, etc).
Btw, I reckon the 22mm-15mm reducer is closer to the boiler than I thought (I had a closer look last night). The 22mm comes out of the meter and goes straight back...