Workout blocks or wrestling, or both?

Currently I have a pretty good routine, but I'm thinking that for simplicity I might just do wrestling rather than this over optimized routine I currently have.

My main concern is, if it is enough or not? I see recommendations for it online, but I'm unsure on what exercises to do strength wise along with wrestling? Should I just do deadlifts and squats? Pull ups, dips ect.
(Classic on top of wrestling)

Right now my original routine is purely calisthenics with a dabble of weights, vest, dumbells ect.

(21, about 83-85ishKG, 6ft and my bfp is probably around 16-18ish percent and I work as a window fitter)