you stay outta my hood homie!
i'd tackle the running/over heating first before the leak as long as it's not too egregious.
yank that t-stat, run some motor purr drive & flush thru there (per the directions on the bottle), slam in a new t-stat and see where you're at.
sounds like a solid...