Plumbing setup with on demand water heater

Hi, I'm wondering if any plumbing experts can help me out.
I have created this diagram to show how I currently have my plumbing setup in my galley. I'm using a 10gallon tank on the floor of the galley with a camplux on demand propane water heater mounted in a box outside the camper. I have the drain exiting the side that will fill a 5gallon bucket I can go empty.
When I first set this up I just sorta went for it not knowing much about plumbing and used reinforced braided tubing.
I'm using a Shurflow pump, something like 2.5gal / min.
Everything was working fine and continues to work fine with this setup, however, I do get bulging of my plumbing lines, mostly coming out of the heater.
The pump is designed to kick on when the faucet is running but from what I remember, the pump continues to run to the hot water heater when the faucets are off.
I haven't put the plumbing back together since last summer and before I do I hope to get some better plumbing advice here.
I also have some random valves throughout that were placed unintelligently by me I would guess.
I have created this diagram to show how I currently have my plumbing setup in my galley. I'm using a 10gallon tank on the floor of the galley with a camplux on demand propane water heater mounted in a box outside the camper. I have the drain exiting the side that will fill a 5gallon bucket I can go empty.
When I first set this up I just sorta went for it not knowing much about plumbing and used reinforced braided tubing.
I'm using a Shurflow pump, something like 2.5gal / min.
Everything was working fine and continues to work fine with this setup, however, I do get bulging of my plumbing lines, mostly coming out of the heater.
The pump is designed to kick on when the faucet is running but from what I remember, the pump continues to run to the hot water heater when the faucets are off.
I haven't put the plumbing back together since last summer and before I do I hope to get some better plumbing advice here.
I also have some random valves throughout that were placed unintelligently by me I would guess.