Between alignment, incidence, struts, cabanes, rigging, the whole nine, I don't see anything out of the ordinary about spending upwards of two or three weeks sometimes depending on the plane and how much you want to put in to the detail. Bipes can be touchy if not properly set up. As for the OP, looks like you got a good grip on yours. Good luck with the re-maiden. I'll bet it flies a lot better.