What spindles do I need?

You need an F/M/J spindle, the A body spindles are shorter in height. But you can replace BOTH with A body spindles and use all your existing components.