A better price formthe pressure switch. If you determine it is needed..
https://www.adventurerv.net/pressure...h-p-36241.html
Sounds like you are making progress in this issue.
Over in the Alpine world the same water heater is causing many many owners similar issues as you are experiencing…