Case 1 = select 5
Case 2 = select 1 .... most definately.
Perhaps it will help you to think ... always take the most conservative approach. For example, in case 2, you know with certainty that the flaps are at least at 1, likely more than that, but assuming they are at 1 will be the conservative for approach speed calculations.
Sawbones (former B737 Instructor/Check Captain)