Honestly I just read your original build.I thought was good, except theres no reason to buy rpm heads unless you have them. The trick flows far exceed the rpm.
Annnd your cam choice was waaay small. Otherwise I think youre getting the right idea.
Your second build looks good as well.
Either way youll be happy. It doesn't cost that much more to add cubes.
No you don't need a solid roller. That will severely limit longevity. It can be done but not recommended.
And if it were my engine, id choose something in the 240-250 range @050.