My interpretation is that Scenario A is acceptable.
However, I am pretty sure Scenario B is not acceptable - I recall seeing a training memo in December of 05 (or whatever they are called) stating that the only reason over night qualifying cross countries would be accepted was if the stop was due to unforseen technical reasons.
Someone at an FTO in the UK would have to confirm the latter - or anywhere - I assume they forward the memos to all FTOs??
Safe Flying.