Thanks Dave and Gar.

Added them to the list.

I will send an email to Frank Keane and see what they will offer me.

I will keep the list updated with prices, if i find better ones. It will help me to keep track where to buy and what and hopefully, if someone plans an upgrade themselves, it would serve as some sort of guide price.