I think you're doing the right thing, too!
I ordered mine from the factory - but I ordered it in December (2000) and that was no problem 'cause I wouldn't be able to actually USE it 'til April (2001) - so there was plenty of time.
I felt that the FACTORY folks had better "access" to areas UNDER the liner, in the bilges, etc. to do a better job - WHILE the boat was being BUILT - rather than the dealer having to do these things from the TOPSIDE, ONLY!
I got a Bimini top, so I feel like the factory could "get at it" better than the dealer to make it good and STURDY from UNDER the liner. Same with the full bow rail!
Both items are VERY "sturdy" - having been done at the factory!
But the WAITING can be hard on you, for sure!
Enjoy the rig - sounds NICE!
Regards,