In most cases you would reduce your pitch by two degrees (21 to a 19). This is due to thin air and the engine reducing HP. This is kind of rule of thumb. Like all prop changes your results can vary.
If your going to be there for good I would recommend getting into the carb and installing smaller main jets. Keep in mind if you have smaller jets installed and return to lower altitude you will be running lean, and can damage the engine