You may be able to just swap Spindles. i know that they used the same kingpin sets for a lot of years.