You are also correct. I forgot to mention that I throw out the original Tamiya self tapping screws and replace with button head machine screws.
-ah, my mistake ...didn't realize this was the case. Yes, I am using the Tamiya "screws" not after market button head machine "hex" screws. ...now that makes sense why you would need to tap the holes.