Yep, I'm in the same boat. Small Grant and blocks about everything. Seems like I take 2 steps forward and one back on a consistant basis.....but that's O.K.
If you don't mind my asking, did you buy another aftermarket, or go back stock? Edit: I just re-read your post.