125-200cc 125 frame swap

Continuing with my 99 WR 125 build I have now been able to ride the bike a few times and I'm happy with the motor. Carrying the front wheel out of an uphill corner on my GP track today convinced me! I've been hesitant to throw money at this bike due to never having ridden one so I took some shortcuts. I have found that my fix for the linkage mount on the frame didn't work (ok ya I didn't think JB weld would work either!). The mount is ovaled, allowing free play in the suspension. A 1/8th inch gap at the mount makes for a couple inches of slop at the end of the swingarm. It would be very difficult to weld and at this point I want to do a nice build so I'd like to get a good used frame. I have already converted to the '04 bodywork so I assume the '04 frame would work but I don't want to take that risk.
So what year frames will swap with the '99??
Thanks,
Jason

I found a '99 CR frame on a popular auction site for $60 with free shipping so I jumped on it.
Maybe I'll get it powdercoated and do a build to make you guys proud!