The water shut off is a pull and push type, pull up to turn off and push in to turn on is this and all in one piece, I can't figure out how to disconnect the line from the shut off

Hello Wilddaisy, if your angle stop ( shut off valve ) and water supply come in one piece than you cannot separate water supply from angle stop. You will have to turn off main water valve in front of your house. Then, install new angle stop and water supply.

However if it leaks from threaded connection than you may try to tighten it a bit more rather then replacing both items.

Hope that helps, Back to you. Milo

Solid advice from Milo,
Can you tell us what's leaking? Is it the connection from the wall? Is it where it connects to the tank? Back to you, Tom

That style "aero.?" if memory serves me correctly is removed by twisting and pulling the whole stop off. Afterwards, replace with compression nut style. The riser is not replaceable. Like a forerunner to sharkbite but removeable without the tool. Make sure house water is off and pressure released.