fender jazz bass upgrade

I've got a Mexican jazz bass that I BEAT on like a workhorse in my metal band. Due to money, instead of paying out for a real American j bass I want to upgrade my mexi. We tune in C# standard and my bass has a hard time with intonation. I started by ordering a high mass bridge and american model...