I would replace both, its your brakes dude. Not something to play around with. Keep the old stuff, just to say you have the originals if you like. As far as aftermarket goes, unless your changing your whole brake system out. I cant see aftermarket booster or M/C doing you any good. Just get a good quailty one, i like NAPA parts better than Autozone.