Yeah, it sounds like you should diet down to a lean state and start over. Train with HST, get strong and do a proper bulk, counting macros and everything.
Getting down to a lean state is something I struggle with also. I have never been completely lean. I'm trying to diet now.
I've kept reducing my cals lately to the point where i'm now on 1500 cals a day where I have been for a month. I weight train 3 times a week and also do 10 30 second sprints 3 times per week. I haven't really lost anything in a month. Maybe a pound but thats it.