Just do a straight swap, front end w. forks, calipers and everything...
Done... now you have no more issues + dual front disk set up...
Now you just have to worry about the rear...ARe you planning to put a disk brake set up to go with your Aluminum rims?