A lot of people don't realise that EFR can be substituted by most first aid courses run by relevant bodies (Red Cross, SJA etc here). Probably easier to find a course as well and it will probably be a lot more comprehensive than a course restricted to diving (I know when I did them we asked people what jobs they did to get an idea of situations they might come across to make the course more relevant to them).I don't recall doing the panicked surface rescue in DM course, but I know we did unconscious diver on the bottom.
Re EFR--I had this cancelled, postponed a time or two. I went to another organisation (SJA in Canada) that filled the requirement--they never cancel because it's not just divers, it's a lot of people who need this as a job requirement. And, it was more thorough and CHEAPER.