If it was me, and if it was possible, I would switch over to manual hubs. Manual hubs would 'unlock' the front end and save wear and tear on the front end components. Look for a good set of Aisn hubs.
Jim