Just to update this thread -
I bottled this weekend and popped one open to see how bad the skunk was in my beer. To my surprise it wasn't bad at all! It amounted to a very slight off taste, but nothing that would put you off. With a few weeks in the bottle and served chilled I think it will be a fine brew (at least for my first beer). Thanks to everyone for your suggestions. I'll try and remember to update this thread again when I crack another open.