Hello and welcome!
Yes there is "child swap" for the rides- plus don't forget there will be alot he can go on too (my youngest will be 19 months when we travel and there's alot even he can come on with us!) you all queue together, one of you rides, the other waits with the child and then as soon as you are off the other can go in the next ride (I think... something very similar) Don't forget alot of things are play areas, shows and walk thrus as well so plenty to do aside from the big rides with height restrictions.
There are several nanny services but i can't think of the names- someone else will know though! And if you're staying on site several of the resorts have childrens clubs for a fee for guests and people dining in their restaurants.