You wait 20 minutes after fruit before having a carbs meal.
You have to wait an hour before having a protein/fats meal.

After meals, you have to wait 2 hours before eating fruit.

For switching from one meal type to the other, you have it right -- 3 hours.