So while I was away they decided to release drupal 4.3. What swines!
Anyway, we're now on 4.3 and it's running like a charm. I had a few minor issues with the database upgrade, but nothing nasty and probably more due to me dicking around with some stuff during the 4.2 cycle.
Intergrated admin menus++ (hence the slight reordering of blocks).