Again I would recommend the Surge, the reason why is because of the weight, it is good for you, since again, it gives the yo-yo stability which you need as a beginner and a longer sleep time, which also helps when you are a beginner. The gap doesn’t really matter at this point, it may snag perhaps if you go to fast, but since your a beginner I don’t believe you really have to be worried about that. The shims if you choose to buy it , are basically like spacers they should not effect the play of the yo-yo as long as you put them in correctly and you don’t over-tighten your yo-yo. It is simple to put in, when I bought the Surge it was actually my first time trying shims and I was able to put them in, all you have to do is snap them around the bearing seat, after that you just re-assemble the yo-yo as you usually would. However if you do have problems you know you can always come to us for help. 
However it seems like you want to get the Onestar, since your making excuses as why you shouldn’t get a Surge. This is fine, just because we suggest that you get the Surge doesn’t mean you have to, get the Onestar, you have wanted it from the beginning, trust your gut and get it. The Onestar is a fantastic yo-yo for you and I am sure the new shape will be fun for you since you have been playing and organic shaped all this time, why not add some variety and get a V-shaped Onestar. I’m sure whatever yo-yo you choose will play great for you. Good luck on your choice! 