I think you should get on to it straight away, I wouldn't think that you are cutting it too fine at the moment, but you must consider the christmas post. Not sure whether you can get an appointment for your passport, but you can get the Post Office to check the application and that can speed things along a bit.
As for the visa, the turnaround times have not been so bad, and I should think that the applications will be reducing a little now.