I will suggest a focus for your training that makes everything much simpler. It is perfectly possible to achieve your goals with the amount of time that you are already investing, having a goal that has a clear path and end point and then you will know when to reach it. Train to look like a Greek God.