I have the same concern for my 21 BB. Really like the vehicle but worried about its longevity so I purchased an extended warranty for coverage to 75k miles.
Just curious - what is the year model of your BS and what was the mileage when you experienced the water pump failure? I have a 21 BB with 40K miles and have been monitoring my fluid level due to the stories on this forum - no problem so far…..