given what you have and how you are using it, I don't think you should change the front camber at all. 2-2.5o is the most you would want for a mostly street driven car, especially on standard road tyres.
3o at the rear is way too much, you should get adjustable bushes for the rear and bring it back to 1.5o, 2 at the most.
If you want to spend some money on suspension (great idea), buy a set of nice, hard sway bars. You'll love the difference.