How do you say

He has been back in training for three months and will be raring to go for next month’s tournament.

..in Chinese?

他已经在训练中恢复了三个月,准备在下个月的比赛中全力以赴

tā yǐ jīng zài xùn liàn zhōng huī fù le sān gè yuè , zhǔn bèi zài xià gè yuè de bǐ sài zhōng quán lì yǐ fù

How do you say "Their new ship is still in trial stages, due to go into commercial service in three months." in Chinese?