Surging could be ignition related etc. Tough to tell you what to do without proving what is actually going on.

If you are going to have the trans rebuilt, then yes.. do all the upgrades and ensure where ever you have the work done checks clutch basket clearance and doesn't just drop in the standard number of plates/clutches that gm has in the book.