Another trick for part 1 of your question is to simply re export from C2 overwritting your old folder
then, in XDK go to your "develop" tab, right click in the list of files on the left and choose "Refresh File Tree"
thus skipping having to close and reopen the program