What he said ! You're doing a great job on this one.
I've seen a lot of " kit bash " models where they just grab stuff from several models and stick it all together. Most of the time they don't take time to sort out the details but this model you're building gets it right from the start.