On the subject of when Jesus kept the passover, I decided to do a Google search on "When did Jesus keep the Passover?" and the first article my eyes landed on, I clicked on and found a very interesting article, well written and thought out, which would appear to explain the supposed discrepancy quite well.

I thought you might be interested in it.

biblicalnewmoon.com/did-jesus-keep-the-passover-before-he-suffered/