You're already doing the right thing. 36c, where are you?
EDIT genphreak is right on. 10w-40, which I always used in my M30s, is recommended only up to 10c. 20w-50 or even staight 40 is what is recommended in the owners book for '89 M30s. The lighter oil never harmed mine but your temps are typically higher.