Unless the actual room configuration of whatever Riv villa/room type you're looking at suits your needs better than what will just be a basic hotel room layout at CR, then I also vote CR. At that age it's really hard to downplay the convenience of being able to walk to MK and having the monorail there in case you wanted to take a spin around the other monorail resorts for dining (usually more of a benefit when everything is open, but it's still a benefit now). At that age we spent a lot of time at MK - having 100% control over your access to/from MK is really, really nice.
One knock I'll give CR with a 2-year old is no zero entry pool - that was something we always sought out at that particular age. They also only have a really dinky kids water/squirt area, which you may find you like better for a 2-year old.... but it in no way compares to the elaborately themed kid's splash areas at other resorts and the one at Riv. But at 2 and it being Feb, you may be borderline in how much the pool/water amenities really matter.
