I did a concise tutorial on lightmapping that I think the area could benefit from.
Ok Whil, i found your tut.
In a glance i do not see anything in it, i don't use.
But if there is i will let you know.
I think its very good you made this., Lightning is a difficult task.
One thing can be done better , it has to do with the UV lightmap.
I never use it the way you described because you will get black lines around many faces on unwanted places.
Instead of that i advise to always do a proper UV map.
Most of the time this has already been done for the main layer.
Then make a new layer while being in object mode.
The new layer will have exact the same layout as the upper one.
Then in edit mode , inside the UV image editor make a new image.
Select all vertices in the editor.
Press in the UV image editor " Ctrl A" to average the island scale
Then press " Ctrl P " in order to pack all islands in optimal format inside the new image.
Now (after Baking) you wont have any annoying black lines because they follow the edges off your mapping.
When some islands are still to small , select them and scale them a bit bigger.
..and press "Crtl P" to pack them again in their new format.
Bake ambient occlusion or lightmap on this image like i explained .
Try it, and you will notice this is way better!!!
After a while this becomes second nature for every object.
Ps, if i have an object ready i will send it to you, but it has no priority for me, i work very hard on the cathedral, it has to be finished before end of year season.