Your calculations look correct. Civil WRE continues to post the highest passing rates, even with the exam specs shift to depth only.Pass rates for Civil PE July 2024 can be found at Civil | NCEES
The overall passing rate, regardless of first time or repeat and whatever the Civil PE you take is 57.4%. Below is spreadsheet showing how I calculated the overall passing rate which is the red letters at the bottom right. See previous posts on comparing the overall pass rates to previous years.
View attachment 29149