You should definitely use $4000 for 2015, because that's what you paid.
I don't think you need to amend 2014, if you only got $858. Even though you entered $10,000, it wasn't all used because it only took $4290 (much less than the $8000 allowed) to get you the $858 credit that got your tax bill to 0.
