I'd start with the bump stops first, otherwise you won't know what actually cured the bottoming out (plus some rear shocks bust internally if over compressed)

Jon M