Tested the battery again (even though the shop told me it was okay) turned out to hold no charge, and it was only a 270 cca battery.
Ended up getting an Aussie made 550cca battery and it seems to have solved all the issues. There is no drain and the alternator seems to be fine.
Will be getting the rust fixed in the next few weeks either by perfection body works at capalaba or my neighbour
Motor is coming out in A few weeks to get a full service
Thanks so much for all your help. Hopefully can take it to a club run soon!