Didn't get any replies so if you're still looking for suggestions, the stock caps are not poly, pretty sure they are a mylar type & have 1 electrolytic in the bass section. Being they are at least 20+ years old it's probably a good idea to replace them as caps do age & fall out of spec. You can use whatever brand fits your budget, most prefer a poly type cap, anything from a few dollars each for daytons or similar priced brands to mid level sonicaps (what crites uses) or high dollar brands. The main benefit is getting newer caps of better quality than stock. I have used daytons from parts express in a few speakers that sound very good but recently have been using ERSE in my klipsch speakers, they get good reviews & are budget priced with fast shipping.
I have heard of bypassing the switch but not sure theres much of a sonic difference to do that, it's there for a reason to protect the tweeters so your call on that, personally I'd leave it. The biggest improvement will be new caps, doubt anyone could tell the difference on the switch in a blind A-B test.