Tough 301 Decision - Help!

I have a site that's ranking well but it has a lot of internal 301's from when the new site was built a few years ago.

The new site initially crashed in the rankings but when I uncovered all of the old url's and redirected them properly it has ranked really well ever since.

But now I have to move the site to a full EV SSL. So questions are:

Should I just leave those old 301's the way they are and just redirect the current pages to the ssl version now?

The downside of leaving it is that it would now go through 2 x 301's now. The upside is, I don't upset the trust by changing the original 301 created years ago. If I left it, the response path would look like this:

http://example.com/spammy-old-url/ >> 301 to >> http://example.com/clean-short/ >> 301 to >> https://example.com/clean-short/


Or should I redirect those old original url's straight to the new https pages like this:

http://example.com/spammy-old-url/ >> now new 301 straight to >> https://example.com/clean-short/

and also I would need current page http://example.com/clean-short/ >> now 301'd to ssl version >> https://example.com/clean-short/

Thoughts?

Cheers