Doing the later will improve the prior. Just keep doing it and it will come together. Been reading your posts and you seem very vigilant at both hunting and seeking improvement. If you stay in the game at your current level of effort you will put it together in no time.