Thanks everybody for the input.
Regarding the diacetyl, my understanding is that this is something that occurs during fermentation. Whether I have the beer for a month or a year, if there's diacetyl, it will always be there. Faded a bit over time maybe, but always there because of it...