Well done man ! Following in your trail lol. Way to go getting back into working out. It sounds great that you are paying attention to warm up smartly before and also to do yoga/stretching afterwards. I'm slowly getting into yoga a bit myself. Got a book on it and so far I'm practicing one yoga warm up routine.