Good info. I may be wrong but your retirement info may be incorrect. 24 year credit for 20 year service is for USUHS students. For HPSP students it isn't the case.
Also each year served after 20 years tranlates into 2.5%. So after 30 years of service I think you get about 75%.