I used a kit from Jim for my 500B. And likewise some can caps were replaced with discrete components. That took some time to figure out how to wire but I eventually did. It’s been a couple years and the receiver still sounds great. It looks like you are on the right track here.