Look at that Haze website. He illustrates the best compromise solution making do with what you've got.

Whichever you go for in future, look for an instrument with either a conventional six independent saddle bridge (Fender style -fixed renders less potential tuning issues than vibrato), quality designed adjustable Tune-O-Matic, or intonable Wraparound if you go there next time.