They should have had RDJ be Black Panther.
About Black Widow and not getting her own movie, I'm sure she will have decent screen time in Avengers 2 and Avengers 3 pt. I and pt. II. She also was a main character in Captain America 2 and will probably be a main character in Captain America 3. Something tells me she will side with Captain America.