Hey Ian – Congrats on your progress! Glad I’ve been an inspiration to you!
If strength is priority #1, you might want to stop doing circuits and do consecutive sets of the same exercises with 2-3 mins rest between sets. There are an infinite number of ways to structure your workouts, so try different things and have fun with it. In time, you will find what works best for you. There is no one perfect program.