I am getting air building up in my water heater in my 2018 forest river. I am not having any issue with the cold lines. This is using either city connection or pump, it happens with both.
Ensure you bleed the air out of the water heater. Just open the pressure/temperature safety valve (lift handle) until water comes out, then you will be able to clear out the lines. Hope this helps.