You are on the right path. 2 questions: what ID is your hard line from air trap to pump? Ideally, you want to keep the large ID all the way to, or as close the pump, as you can. Pumps are weak on the suction side and strong on the pressure side. Also, the harder the pump has to pull on the suction side due to restriction to deliver target flow on the pressure side, the more you increase the possibility of sucking an air bubble from a connection, or even causing the airtrap's membrane itself to cavitate (yes, this can also happen). For that turbine, you want to maintain 3/16 ID all the way to the pump if possible.

Second question: What is your clunk line? I just pulled Tygon out of a 2 year old fuel system and could not believe what poor shape it was in. Literally disintegrating. Use Viton if possible inside the tank. They make various sizes including 3/16 ID and McMaster Carr carries it. The BVM HF clunk is a great choice. Make sure all the internal passages have been thoroughly cleaned to remove brass particles. The tygon you selected is fine outside the tank and will last a long time as long as both side are not soaked in fuel.