Bit of a tough choice. The bikes are very similar in specs so it would really come down to personal taste. If you like funky headlights, then go for the BM.
"I prefer doing all maintenance and fixes myself". Unless you are a factory trained mechanic, I wouldn't be touching either bike, They are...