By the look of things I'd say your enjoying the build. So if you find rivets a simple task then enjoy.
If it's not so much..I'd reccomend you finish the detail and undercoat before making the final decision on rivets.
( Once it's all one colour it'll either pull together or feel like there's still something missing)