That's what I've started doing with a few little changes. It's a killer but I'm hoping it'll pay off. It seems to hit the right spots. I've also found the Minus The Gym guy on Youtube useful - I got a dip station a few days ago based on his video showing 15 exercises you can use it for [1].

[1] https://www.youtube.com/watch?v=W8jXc1zaLuQ