tbh if your competent to solder and remake your own connector blocks..then id suggest that you do it. At least youd know the ones you made are working and likely to last.