should I convert to a "modern" U-joint system?

Driven that much you could only be better off with a standard style driveline.