Do you want to be pipe stress analyst or Mechanical structure stress analyst? Can you tell me how many subjects do you see under mechanical engineering?
If you wanna to be structural stress analyst, civil engineering is more better than mechanical engineering. All of big mechanical structure are approved by civil structural engineer even if you were be a Professional Engineer Licensed of mechanical engineering. So, you decide what you like.