Baggage Door Hinge

[F3fifty]

My 2012 Montana Mountaineer has the Baggage Slam doors which are very nice from the earlier models and one of the hinges is working loose and now some of the many screws won't tighten up. Anyone else have this problem. IM thinking replace the screws with the next size up plus add a little wood glue? Warranty is up in couple of weeks and this is probably what the dealer will do? Anyone with previous experience with the newer style doors and hinges working loose?

Thanks