It would be a good idea to stop shaving. Just because porn stars often have shaved pubes it doesn't mean you should.
I had this problem as well a year or two ago.. I started using a good shaving cream and an after shave lotion. It no longer itched and I rarely got shaving bumps. I recommend waxing tho. It usually doesn't grow back for at least 2 weeks and u don't have to deal with bumps, cuts, sores, and the hassle!