I made sure there's enough room in rootfs, disabled the additional repos I had used extensively and proceeded with the OTA upgrade. No problems encountered. Only had to redo my own HW keyboard tweaks that were overwritten and re-enable the repos. I'm typing this on my fully functional N900 now.