Not a lot wrong with your current set up tbh. Now you've added a 5w I'd say you're good to go. Don't worry about it and just play as much as you can and get some lessons.
Otherwise, bag setup seemed/seems fine. The 3-wood vs 5-wood debate might be a level of tinkering that's not really required at this stage. Make sure you have a Sand Wedge - either as part of the set or as a specialist high bounce 56* - though.