About nr. 3: I agree with t1mekill3r that
a hug is not fitting for the Cazador scene. As hard as it is watching him from a distance it's important he does this on his own, I don't even think he would want physical contact at that moment.

It's the total opposite for the ending though. You've come longer in your relationship and I think he'd appreciate physical comfort. I think it would help a lot if the romance dialogue after the docks scene would be moved to the place behind the crates instead of some random room. Astarion and the pc sit closely side by side and have their conversation. It's dark, implying that the two have been sitting there a while and also that the pc has run after him right after the docks scene to see if he's ok and to keep him company in his moment of grief. It's not perfect, but it would need the least tweaking of the end scene imo.