I can't answer as what components you should be using, but it's looking good. Very clean and I'm sure you're going to be thrilled with the results when it's done. It obviously had some issues that needed attention.