I think that you are going the right direction but do beware of pressure thrust .... If there is any possibility of piping being misaligned within containment of thrust blocks, a large lateral load can build up. The most obvious risk would be in buried pipe following ground terrain which rises then falls ... it could lead to upheaval buckling and dependent upon backfill, the line could burst out of the ground.