Nice Squatting.
You know, if you want your Front Squats to come up, do them prior to back squats. Usually when you're gonna do more than 1 squat variation in a workout session, you move from the exercise which requires the most ROM to the one that requires the least. So, like in that famous 4 Squat Workout, they have you do Overhead Squats, Front Squats, Back Squats and then half Squats. This is just a suggestion because you wrote you were tired...If you arrange the exercises like this then you never reduce the weight on the bar. It always goes up because you can always front squat more than you can overhead squat and you can always back squats more than you front squat and everyone can half squat the most!
So give it a shot if you like, TBlock.
I agree with your observations. You should be rowing more. Good luck!