You are correct, you will need the 1000µF 35V capacitor for CP2. There are two variations of the Classic analog boards. The earlier 630-0395 (yours) has the large female CRT power connector. The later Classic and Classic II's (630-0525) have the 4 naked power pins without the plastic connector...