So your workout routine sounds well and it seems like you are really conscious regarding your fitness level. It’s really a good thing that people love to take care of themselves.
According to me your routine and workout plan is fine if you keep working hard it will pay off. Your gym routine, your workout plan sounds good, nothing to add more just be strict to it in order to have better results.