thats is one of the cleanest engine bays ive ever seen!
as far as engine goes i think it goes on personal preference, some people love a tough NA motor but other people love forced induction cars!
i say go for your plans with the rebuild and then once thats done if your not happy then run the supercharger on it or just go supercharged if you just want the power quicker and easier!
thats just my opinion though but theres plenty of people on here that can tell you the pros and cons.
cheers tom