yes, i do not think the old #2 greensite would work.
what jim wagner suggested was to move #3 green the other direction about in the middle of current 4th hole, which would be eliminated. then to lengthen #5 with a new green further back. then connect the routing back to the 6th tee with a new par 3 in between 5 & 6. this would also improve the practice area.
i agree that it would also be good to replace the 2nd hole as well, but you could easily go from one green straight to #3 tee. then you would just have to find a place for another par 3, which could be either on the front or back nine, since both already have two par 3's.
dan