FINALLY. I am out off this trade and I am relieved.
After all the rolling and extra credits, or even credits, I ended up buying back the short put a day or two before expiration when it was less than .05 so it was commission free. I then let the long leg expire OTM worhtless because I wasn't able to sell it anyway.
I think this trade has taught me a lot about rolling and staying in a trade. I will look through it more in depth at a later time, but it feels good to finally be out and be profitable from it.