Unless the Hulk actually appears int eh film, we won't see a Hulkbuster.
I like the growth of the Armory - though I suspect he'll be running out of wallspace in his basement before long at the rate he's going!
In the comics, Tony tended to keep around (or create replicas of) his older armors to keep around more for sentimental reasons than having an eye of ever actually using them again. This has proven a good idea on several occasions when a bad guy would find a weakness in Tony's latest suit and he's forced to downgrade, though he can still do his thing (and we get to see some old favorite armors again, most often the "classic" red and gold he spent twenty years using). On one occasion, a bunch of guys who once piloted the armor (plus Bethany Cabe) used a squadron of old armors against Ultimo while Tony was incapaciated. THAT is something I wouldn't mind seeing in a movie! Though in this movie universe Tony doesn't have many friends...