Either way, once you take the class (whether your gear is borrowed or permitted as it currently is), you'll end up changing your gear over anyway. If you really want to go the fundies route, you might as well start looking at making the switch over before the class so you can take it in your own gear. One of the great things in the class is having the instructor fine tune your kit to conform and fit perfectly for you. He'll switch things, move things around, tighten or loosen things up, make suggestions, maybe even (if it's anything like my class) cut some stuff off.
If you take a little time, hook up with a local DIR diver or two, talk to an instructor, read the equipment requirements on the GUE site and read through the many posts here on SB about the dir kit, you can switch over to the right stuff the first time. That's what worked for me. I've never needed to replace the original wing, BP, fins and hoses I bought before my class.
