I like the first list quite a bit. Boromir might seem expensive for 600 pts but I've had great success with him even at 500 pts. He is hard to stop with his D7, 6 might/fight and 3's in all the right places.
I would recommend finding the points to upgrade the Captain of Minas Tirith to Faramir (heavy armour, shield, lance and horse/armored horse). He is a fantastic mid-range hero and does a great job leading cavalry. For some more tips and tricks on Gondor check out the DCHL video on the topic:
https://www.youtube.com/watch?v=prAg8QqQdYk