If you want to simplify, just do a primary only. I don't think you will get any less orange flavor. If you soak the zest in vodka while the beer ferments, you can combine them at kegging/bottling or just toss into the primary after fermentation is complete.