Insulation, Radiant and Vapor Barriers - adding attic insulation

We have about 8" of blown insulation in our upper level attic (need R-38 here), 23' x 40' that is 5' at ridge, 24" on center 2x4 joists/rafters, no vapor barrier, recessed lights covered with the insulation, whole house fan, (5) 8" x 16" grill soffit vents on one soffit (40' direction), (3) vents on 1/2 of the other (the other 1/2 joins the garage roof which is the lower level roof/attic), 15" on center foam insulation vent baffles, (6) rectangular roof vents. The attic is unbearably hot in the summer (as is the 2nd floor living space). We're having the 21+ year old roof redone this summer, maybe with a ridge vent. I'm thinking of (1) removing the old foam vent baffles and replacing with poly sheeting stapled to the inside of the rafters (leaving a 2"- 2 1/2" air space under roofing deck) down to and stapled to the wall plate, (2) adding some soffit vents (3) adding insulation (4) removing insulation from recessed lights (5) adding vapor barrier. Any thoughts or advice? I could really use it.