Should I sign up for IBR now?

I am not sure what the best idea for my student loan situation would be. I have 2 federal consolidated loans, I think. One loan contains my subsidized under-grad and graduate loans ($78K subsidized, $10K unsubsidized). This loan is on the SAVE plan. The other loan is consolidated parent plus loans for my son ($46K). It is on the ICR plan. I have made payments on both of these loans. When the whole SAVE mess started, all my loans were put into forbearance and I did not have to make any payments on either loan. I also tried to double consolidate before the deadline, but Ed Financial said I did not have any loans to consolidate and denied my application. They told me to talk to my servicer who was/is Aidvantage. Then, all the consolidation was shut down due to lawsuits. So, the double consolidation never happened.

All my loans are still in the forbearance. I have not been very excited to restart payments, because the payments are 35% of my income. The servicer charges me 15% payments on my personal student loans and 20% on the parent plus loans. I guess with IBR it will be 15% and 15% which is not a ton better, but some. I have about 5 years on my personal student loans until 25 year forgiveness and about 10 on the parent plus loans for forgiven. That is if the new counts still stand and are not repealed or something.

I am single and 60 years old. I make about $60K a year. I put about half of my income into my 401K and IRA, because I have not been able to save a lot for retirement. I will most likely retire within 7 years. I read that parent plus loans are eligible for IBR now, but you have to make a payment under ICR or something. Do my past payments under ICR count as that necessary payment or do I need to make another one? I did not want to go on RAP, because it would extend the time until my loans are forgiven. It did not seem better, but maybe it is? I would appreciate any ideas that could help me. Thanks in advance.