Well, there's still hope... the 25th (i.e. "Classic") line will see two new 7 packs this year, and a Sgt. Slaughter Comic-Con exclusive. Hasbro hasn't officially killed the Classic line, they just put it on hiatus... if the 7 packs sell well, they'll probably bring more out.
I'm sure Hasbro will find a way two get the 25th style figures back on the shelf with the movie style figures. They already mix genres/styles/themes with Star Wars and TF Universe, right?
I fear more repaints are on the way in those 7 packs of figures due out this year that have previously been released. Good news about Sgt. Slaughter though. I was about ready to dabble with making a custom fig.