Yes, there are two bedroom CL villas at Jambo House on the sixth floor. They are lockoffs. There are basically five of them, but then there are no studios or one bedrooms. So every studio or one bedroom takes a two bedroom out of the total. Three are savanna view and two are pool view and you cannot request a view because there are so few of them However, they go extremely quickly with DVC bookings by walking. So if you try to book at 11 months out, you'll probably find them all gone. Getting one by renting is a unicorn.
The two bedroom suites are different from villas. They don't have the full kitchen or laundry room, but they do have some kitchen facilities (Just not the full kitchen) like a microwave, coffee maker, small bar sink.
If you give up Club level, you could get any two bedroom villa at Kidani Village since they have dedicated two bedroom villas there. One king bed, two queen beds, one queen sleeper, one twin sleeper chair.