So I think it's time for a new phone and and the two above look like the best prospects.
I have played with the Samsung Galaxy I and it's quite nice but I don't like the UI. I guess it could have new firwmare installed. I have no experience with the LG but I have had a play with the junior model, the 550 from Telecom. It's a bit laggy (slower processor I guess) and was running 2.2 but the touch seemed accurate and it rotated quickly so I would imagine in the 2X it would be better. The construction seems solid.
The only other option is to wait for the Nexus Prime (3). I like the Google phones because they offer the native Google experience and get the latest firmware.
I also using my Nexus One to view content from Hulu+ and Hulu has not released a version for either of those phones which they might do for the new Nexus (depending upon who makes it) so it might be worthwhile waiting for it.
Those with either of those phones - how are you liking then?