A lot depends on the size of your bike frame. If you have a small frame the harsher ride of Aluminum is more pronounced. Changing wheels probably won't make that much difference. On the other hand, hand built custom wheels are a thing to covet. I'm afraid my answer would be "get both". You might as well go for the custom frame, too. Doing the whole package would probably be cheaper than piece-mealing it.