I wouldn't waste the time or money with the D35 again... I bent a housing once, snapped a shaft on another occasion, spent the cash to get upgraded shafts and then blew a R & P... If you've got the tools and know how, by all means, swap it for a stouter axle.
“The test of the machine is the satisfaction it gives you. There isn't any other test. If the machine produces tranquility it's right. If it disturbs you it's wrong until either the machine or your mind is changed.” ― Robert M. Pirsig, Zen And The Art Of Motorcycle Maintenance: An Inquiry Into Values