Well, it took a little negotiation over the small print, but I have accepted the new position with Independent Diplomat. The boss took it fairly well; there is a good internal candidate who I hope takes my position (though filling her current position will also be tricky).

Ironically I also got a letter from the European Commission telling me that I have not been called for interview for the job I applied for in May! One less thing on my list.