If its not too late I would suggest dedicated knee pads. I have injured my knee twice now within the last 4 months due to the pads slipping off my knee. I know each pad is different and fits each rider differently, but theres no question that dedicated knee pads will work the best for protecting your knee.
IF your wondering whats left to protect your shin as I was Hoots does a dedicated knee pad and a seperate shin pad that connects to the knee pad. Im going to order some up and unfortunately I havnt had a chance to see them yet so Im hoping for the best. But keep in mind that you can cut your leg as much as you want and still ride, but if you mess up your knee youe looking at some downtime from riding.
For upper body armor I would reccomend the hard plastic shell style. Not only do they vent better than the jackets, but they have more coverage than most of the jackets do. Check out fox's roost armor, or even go to a motorcycle shop and look into some motocross armor. Keep in mind that youll need additional arm pads for full coverage. The pressure suit that I have forces me to drink 3 times as much water as I normally do because it sucks it out of me faster than I can drink it which is why Im getting the plastic style.