The Museo del Agua is certainly worth a short visit, if only to see the various porcelain fixtures from earlier days and to admire the beautiful building exterior of ceramic tile.
Have never been to the Museo de La Policia Federal Argentina, but I must say that the photo of those terrifyingly lifelike costumed mannequins really makes me want to go.