Emiya (Archer) Skill Question

So I know his skills will be replaced with upcoming strengthen quests. My question is, is it a waste to upgrade his skills now? Will the levels carry over to the new skills or should I wait to upgrade them?