I have the video done. The HDTV rip matches the Sony blu-ray, color-wise, but has the additional footage, so I used that with some minor enhancements.
As far as the HD trailers, I was considering remastering the trailers in HD myself, if I decide to go that route.