Good advise above, you are on the correct path in tightening the rebound. I'd put the compression back where it started as well.
Doug