If it were me, I would leave the bump stops in place. They are doing the job they were put there for. While it sounds terrible with them in place, it will be metal on metal without them. With the symptoms you are describing, the springs will bottom out with or without the bump stop. With bump stop in place is prob better than without.
