In this paper, we propose a novel beam shaping technique based on orbital angular momentum (OAM) modes for indoor optical wireless communications (OWC). Furthermore, we investigate two spatial diversity techniques, namely repetition-coding (RC) and Alamouti-type orthogonal space-time-block-coding (STBC) for indoor OWC employing the new beam shaping technique. The performance of both diversity schemes is systematically analyzed and compared under different beam shaping techniques using different OAM modes with different power ratios of the modes. It is shown that both RC and STBC can improve the system performance and effective coverage and RC outperforms STBC in all the beam shaping techniques regardless of the power ratios of the different modes. In addition, to further understand the performance of RC and STBC schemes against the signal delays induced during OAM mode conversion, the system tolerance of the two schemes to the delay interval is investigated with different OAM mode-based beam shaping techniques. Numerical results show that higher resistance to the delay interval can be achieved in STBC scheme. The advantage is more obvious when employing OAM0 and OAM1 based beam shaping technique.