An L-shaped room is correct. "L-shaped" sounds like "elle-shaped".

Yes, use "an". The 'n' is added to make the transit between vowels smooth. This reflects the spoken convention, not the written convention.