Sorry Simon, don't mean to rain on your parade, just my opinion, but I do have a small amount of experience here.
Could I be so bold as to post the pic showing the baffle on 22B asking for an opinion, to coroborate what I say ?
I'm just trying to save your engine.
---john---