I would suggest switching to RDL's, as they are less taxing on the lower back. They are one of my fave lifts. However, if I lift heavy on those, they will affect my deadlift if I deadlift in the same week.
One step back, 2 steps forward on the squats. massively nice front squat you have as well.