Thanks for all the great tips folks. Since I can't directly use an 8 spd shifter on the 7 spd cassette, I'll probably just convert it to 9 spd (If the frame has enough clearance). That'll make it easier to get service parts for the next few years.

Cheers.