Ok so ive a really grotty connector block under the tank which is so trempremental its safer to take apart and completely replace it. Which is the better method to go with? Just using bullets or is the a good connector block to replace it with? Its tge 2x3 block that does lights and indicators.