Yeah sounds like you're on the right trail now. The ground down original should seal properly and solve the short stroking issue.