^ Harris turned out not to be such a bad guy after all (especially since he is apparently returning). I rather appreciated that.
As for Amaro's marriage: Agreed. Dick Wolf seems to have caught Whedonitis - not allowing any of his characters to be happy. Still, there's time to fix it.