Ok. It sounds to me like you're doing things right. You may just have an example of a BP who's a bit defensive and needs a little time and extra effort. But it's very uncommon for a BP to remain defensive into adulthood.
I think it's important to recognize the difference between defensive and aggressive. Defensive is common and easy to work with over time, and this behavior definitely sounds defensive and not aggressive.
As for the water...as long as your tap is safe for you to drink it's safe for them too. You can also leave water out for 24 hours to naturally dechlorinate it.