The USAF A-400M equivalent,
AJACS/AM-X, won't hit the street till 2020 at the earliest. So it's wait for the A-400M or buy more C-17s.
I would suggest that we could do worse than also looking at the C-27J as a tactical/SF aircraft at the low end; it can't lift FRES, but neither can the C-130J, but has many tactical advantages and is cheaper. The money saved on buying a couple of C-27J instead of a C-130J at one end of the spectrum would provide the funds for a C-17 instead of a couple of C-130Js at the other.
Yes, we would end up with a 3 type fleet, but we'll end up with that with C-130J, A-400M and C-17 anyway.......