I would get a maxi rider.

We are going to get a maxi rider for DS and he will be 18 months old when baby arrives.