Xamarin 6 and monogame template

So i saw there is already commit for upgrade templates for Xamarin, now i want to ask is there a way to somehow start project already with Monogame 3.5? Or should i wait for 3.6? Also any dates yet? I saw milestone was 2 days ago.

For the time being you have to install the add-in by hand. Just look there: https://github.com/mono/MonoGame/issues/4583#issuecomment-193006294

Should we uninstall the existing addin first before installing this new addin?