Rehabilitation support services should be improved before drugs are decriminalised, Portland mayor Ted Wheeler is expected to tell Australian lawmakers.