Keep plugging away. If you wait for the aftermarket you may be waiting for ever. Plus that is additional time you can not enjoy your car the way you want it.