You could actually free up a good amount of points in this list.
The vindi is cheaper than the havocs, so there is some. And the extra armor on the rhinos is a matter of personal taste, but I find it uneccessary. Theres 60 more points.
The Lord is another matter of taste, and I have a taste for Deamon Princes. Who is your lord accompanied by?
With the points you have, I would try to get more troops in the PM squads. At 2000pts you should try to have more troops. Hell, you might even have enough points for another squad. The alternative would be to take a 2nd HQ which is pretty common at this points level as well.