we've had problems at work with spirit and oil based paint too, its all been phased out and replaced with water based paints, but get down to any local re-finishing supplies of spray shop suppliers and sure they will advise on best action. they will be the ones who will mix it for you.